Merge pull request #93 from harikitech/topic/update_supported_versions

Update supported versions

Author: Surgo

.travis.yml

@@ -1,56 +1,44 @@
 sudo: false
 language: python
+python:
+  - 3.6
+  - 3.7
+  - 3.8
 cache: pip
+env:
+  - DJANGO=2.2
+  - DJANGO=3.0
+  - DJANGO=dev
+
 matrix:
-  fast_finish: true
   include:
-  - python: 2.7
-    env: TOX_ENV=py27-dj111
-  - python: pypy
-    env: TOX_ENV=pypy-dj111
-  - python: 3.4
-    env: TOX_ENV=py34-dj111
-  - python: 3.5
-    env: TOX_ENV=py35-dj111
-  - python: 3.6
-    env: TOX_ENV=py36-dj111
-  - python: pypy3
-    env: TOX_ENV=pypy3-dj111
-  - python: 3.4
-    env: TOX_ENV=py34-dj20
-  - python: 3.5
-    env: TOX_ENV=py35-dj20
-  - python: 3.6
-    env: TOX_ENV=py36-dj20
-  - python: 3.5
-    env: TOX_ENV=py35-djdev
-  - python: 3.6
-    env: TOX_ENV=py36-djdev
-  - python: 3.6
-    env: TOX_ENV=flake8
-  - python: 3.6
-    env: TOX_ENV=isort
-  - python: 3.6
-    env: TOX_ENV=readme
-  - python: 3.6
-    env: TOX_ENV=check-manifest
+    - python: 3.5
+      env: DJANGO=2.2
+    - python: 3.8
+      env: TOXENV=flake8
+    - python: 3.8
+      env: TOXENV=isort
+    - python: 3.8
+      env: TOXENV=readme
+    - python: 3.8
+      env: TOXENV=manifest
   allow_failures:
-  - env: TOX_ENV=py35-djdev
-  - env: TOX_ENV=py36-djdev
+    - env: DJANGO=dev
 install:
-- pip install tox
+- travis_retry python3 -m pip install tox-travis
 script:
-- tox -e "$TOX_ENV"
+- tox
 deploy:
   provider: pypi
-  user: uncovertruth
+  username: __token__
   password:
-    secure: FtNY+8/F79RYpJzfusYBC9HFfDWlevUbS4J5TECm8tyMxAxeHMpLOaL4dd/wPkRkuctUM5LyXux5rpVQTfMA4Dvjdufc7BqexCt056GznJPFRjHW19ExeguTHXW810RIVrFmo5Dk1/AlMpGEeiL3OXoI041h7/vRZe6QWP6P0NCz9UrkZ/Qc9JDZqkXBmhiwvt4P3gu5sbxaiM4IqxhSQ/4DoI87SQlD3nUfgRT2TkqN/Jx0ME0H7l+40HeqZvVq6sh9Muc5/XhDEx5HWt9BSgymeXXG6mT3sewBfinJlQ5/1Rrm+IHa48m/3mLJkfYEs15BQCizvDc6/dRfdtCc/9jYl3e67yEM6Akn+52pTOU4Oa727ZUpAYNCzfY+pHc3E9oI0YFuOl+WYNo5bWUh3IlWAl/eXDGWOvRMF4waUbyjUMiZ+C4pRmRKznYZB9xgbPxHDlR6CMn8P5F5j3ZVbW0BxUEjlDFcDT65gflBhKS1eWTOQRMobR+yjQKlYMlIeCgITbuEYbn2GbL84aN42U910rSQ4SryzqjaOIyxtZG53cGDw2NMm4q7bIwRkj6gbvliA36HIFaRQrI/wtrmr3guy4raPRpEGi7OhFoaPxaqkEs+yF55MEafNM4eJc9swM/K/mbN6FFKIWoWVyXUCUDIWvcPYLWPR/kLidWCNzw=
+    secure: "HBbDdcrrzRrSXbQGz3cz24/xNIW77tVlHQ+D6DS5raOSV7en5CPaiWZ50YkMQa08nfBOR1RBT8JivrC05qz1+TqMwOz0+rinFeGPmu9gLY8f+1kx0UZnmXG7GHsm6dBGOP6nIHA40+rtK/YLuhskdd2hEBIOAuAxXuCSd1UQ/3bj/nuspDwcot9OdJiyn+Xl+cjI39Gt8WlF7ZBjgFRw1hNSIJ2f0or38zf+SSDY6QgKiJZCn+4sooy0assCms84LSKumSl7Ya50IWwBGJgJaNPxikqgTf3rDP9bT25OLtJw78zJnO4QC2PJ9Y7j2tzeYkelHJM794uAtKNaW1SanlYdBXQoE7m1CE8DszZxCtN/siuz+30whFJ885pPaSN3m5uJct/v9GxBEAHtoCrwwdfrTvzVCU43PGwPZvO768k465rRGUnBInLybO5hTq6myajecZB2WhVXMh7/KMcXlVtnD5PvIhxLkLPVIGBK+1wFfvH/4ijZl8Dhz5PXP53AcX/Ohdli7+kd9DQEvieE2bhDpBaJq2r7B4etW/bjz76GQ704uzuF5JXXEibaT1fox8nqJzghuWfcXJvoTa20iR1quuHg0Z4qBIYh76CUXafi4iIZ0fCcIDVPWM7KSp1rvt4BgCdi1csQdTasw0l0WGoKdOSu+LlNSrqzPLoXQlE="
   distributions: sdist bdist_wheel
   skip_upload_docs: true
   on:
-    repo: uncovertruth/django-elastipymemcache
+    repo: harikitech/django-elastipymemcache
     tags: true
-    condition: $TOX_ENV = py36-dj20
+    python: 3.8
+    condition: "$DJANGO = 3.0"
 notifications:
   email: false

MANIFEST.in

@@ -1,4 +1,8 @@
+include LICENSE
+include README.rst
+
 graft django_elastipymemcache
 graft tests
-include README.rst AUTHORS LICENSE CHANGELOG.rst setup.py setup.cfg requirements.txt tox.ini
-global-exclude __pycache__ *.pyc
+
+global-exclude __pycache__
+global-exclude *.py[co]

README.rst

@@ -2,21 +2,11 @@
 django-elastipymemcache
 =======================
 
-:Info: Simple Django cache backend for Amazon ElastiCache (memcached based).
-:Author: UNCOVER TRUTH Inc. <develop@uncovertruth.co.jp>
-:Copyright: © UNCOVER TRUTH Inc.
-:Date: 2018-06-19
-:Version: 1.2.1
-
 .. index: README
-.. image:: https://travis-ci.org/uncovertruth/django-elastipymemcache.svg?branch=master
-    :target: https://travis-ci.org/uncovertruth/django-elastipymemcache
-.. image:: https://codecov.io/gh/uncovertruth/django-elastipymemcache/branch/master/graph/badge.svg
-    :target: https://codecov.io/gh/uncovertruth/django-elastipymemcache
-.. image:: https://requires.io/github/uncovertruth/django-elastipymemcache/requirements.svg?branch=master
-    :target: https://requires.io/github/uncovertruth/django-elastipymemcache/requirements/?branch=master
-.. image:: https://badge.fury.io/py/django-elastipymemcache.svg
-    :target: https://badge.fury.io/py/django-elastipymemcache
+.. image:: https://travis-ci.org/harikitech/django-elastipymemcache.svg?branch=master
+    :target: https://travis-ci.org/harikitech/django-elastipymemcache
+.. image:: https://codecov.io/gh/harikitech/django-elastipymemcache/branch/master/graph/badge.svg
+    :target: https://codecov.io/gh/harikitech/django-elastipymemcache
 
 Purpose
 -------
@@ -31,7 +21,7 @@ Requirements
 ------------
 
 * pymemcache
-* Django>=1.11
+* Django>=2.2
 
 Installation
 ------------

django_elastipymemcache/__init__.py

@@ -1,2 +1,2 @@
-VERSION = (1, 2, 1)
+VERSION = (1, 3, 0)
 __version__ = '.'.join(map(str, VERSION))

setup.py

@@ -12,33 +12,31 @@
     version=django_elastipymemcache.__version__,
     description='Django cache backend for Amazon ElastiCache (memcached)',
     keywords='elasticache amazon cache pymemcache memcached aws',
-    author='UNCOVER TRUTH Inc.',
-    author_email='develop@uncovertruth.co.jp',
-    url='http://github.com/uncovertruth/django-elastipymemcache',
+    author='HarikiTech',
+    author_email='harikitech+noreply@googlegroups.com',
+    url='http://github.com/harikitech/django-elastipymemcache',
     license='MIT',
     long_description=io.open('README.rst').read(),
     platforms='any',
     zip_safe=False,
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Web Environment',
-        'Framework :: Django :: 1.11',
-        'Framework :: Django :: 2.0',
+        'Framework :: Django :: 2.2',
+        'Framework :: Django :: 3.0',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
     packages=find_packages(exclude=('tests',)),
     include_package_data=True,
     install_requires=[
         'pymemcache',
-        'Django>=1.11',
+        'Django>=2.2',
     ],
 )

tox.ini

@@ -1,50 +1,50 @@
 [tox]
 envlist =
-  py{py,27}-dj111,py{py3,34,35,36}-dj{111,20},py{py3,35,36}-dj{dev}
+  py{35,36,37,38}-{dj22},
+  py{36,37,38}-{dj30,djdev},
   flake8,
   isort,
   readme
   check-manifest
 
+[travis:env]
+DJANGO =
+  2.2: dj22
+  3.0: dj30
+  dev: djdev
+
 [testenv]
-basepython =
-  py27: python2.7
-  py34: python3.4
-  py35: python3.5
-  py36: python3.6
-  pypy: pypy
-  pypy3: pypy3
 deps =
-  dj111: Django>=1.11,<2.0
-  dj20: Django>=2.0,<2.1
+  dj22: Django<2.3
+  dj30: Django<3.1
   djdev: https://github.com/django/django/archive/master.tar.gz
   -r{toxinidir}/requirements.txt
-  py36-dj20: codecov
+  py38-dj30: codecov
 setenv =
   PYTHONPATH = {toxinidir}
   CODECOV_TOKEN="8ea69bfe-d9b5-45fc-97f7-ef843bd3d9d2"
 commands =
-  coverage run --source=django_elastipymemcache -m nose
-  py36-dj20: coverage report
-  py36-dj20: coverage xml
-  py36-dj20: codecov
+  coverage run --source=django_elastipymemcache -m nose --verbose
+  py38-dj30: coverage report
+  py38-dj30: coverage xml
+  py38-dj30: codecov
 
 [testenv:flake8]
-basepython = python3.6
+basepython = python3.8
 commands = flake8
 deps = flake8
 
 [testenv:isort]
-basepython = python3.6
+basepython = python3.8
 commands = isort --verbose --check-only --diff django_elastipymemcache tests setup.py
 deps = isort
 
 [testenv:readme]
-basepython = python3.6
+basepython = python3.8
 commands = python setup.py check -r -s
 deps = readme_renderer
 
 [testenv:check-manifest]
-basepython = python3.6
+basepython = python3.8
 commands = check-manifest {toxinidir}
 deps = check-manifest