From ec49e08b64bec3327c5a6c537f9bae242dfaef9a Mon Sep 17 00:00:00 2001 From: Chihiro Kaneko Date: Fri, 21 Sep 2018 18:42:29 +0900 Subject: [PATCH] Add new django versions and Drop EOL versions. --- .travis.yml | 81 +++++--------------- README.rst | 4 +- setup.py | 7 +- tox.ini | 212 ++++++++++++++++------------------------------------ 4 files changed, 90 insertions(+), 214 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4dac53f..4a93bb4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,80 +1,39 @@ language: python python: - - "2.6" - "2.7" - - "3.3" - "3.4" - "3.5" - "3.6" env: - - DJANGO_VERSION='Django>=1.4,<1.5' - - DJANGO_VERSION='Django>=1.5,<1.6' - - DJANGO_VERSION='Django>=1.6,<1.7' - - DJANGO_VERSION='Django>=1.7,<1.8' - - DJANGO_VERSION='Django>=1.8,<1.9' - - DJANGO_VERSION='Django>=1.9,<1.10' - - DJANGO_VERSION='Django>=1.10,<1.11' - DJANGO_VERSION='Django>=1.11,<2.0' + - DJANGO_VERSION='Django>=2.0,<2.1' + - DJANGO_VERSION='Django>=2.1,<2.2' - DJANGO_VERSION='https://github.com/django/django/archive/master.tar.gz' matrix: exclude: - - python: "2.6" - env: DJANGO_VERSION='Django>=1.7,<1.8' - - python: "2.6" - env: DJANGO_VERSION='Django>=1.8,<1.9' - - python: "2.6" - env: DJANGO_VERSION='Django>=1.9,<1.10' - - python: "2.6" - env: DJANGO_VERSION='Django>=1.10,<1.11' - - python: "2.6" - env: DJANGO_VERSION='Django>=1.11,<2.0' - - python: "2.6" - env: DJANGO_VERSION='https://github.com/django/django/archive/master.tar.gz' - python: "2.7" - env: DJANGO_VERSION='https://github.com/django/django/archive/master.tar.gz' - - python: "3.3" - env: DJANGO_VERSION='Django>=1.4,<1.5' - - python: "3.3" - env: DJANGO_VERSION='Django>=1.5,<1.6' - - python: "3.3" - env: DJANGO_VERSION='Django>=1.9,<1.10' - - python: "3.3" - env: DJANGO_VERSION='Django>=1.10,<1.11' - - python: "3.3" env: DJANGO_VERSION='Django>=1.11,<2.0' - - python: "3.3" + - python: "3.4" + env: DJANGO_VERSION='Django>=1.11,<2.0' + - python: "3.4" + env: DJANGO_VERSION='Django>=2.0,<2.1' + - python: "3.5" + env: DJANGO_VERSION='Django>=1.11,<2.0' + - python: "3.5" + env: DJANGO_VERSION='Django>=2.0,<2.1' + - python: "3.5" + env: DJANGO_VERSION='Django>=2.1,<2.2' + - python: "3.5" env: DJANGO_VERSION='https://github.com/django/django/archive/master.tar.gz' - - python: "3.4" - env: DJANGO_VERSION='Django>=1.4,<1.5' - - python: "3.4" - env: DJANGO_VERSION='Django>=1.5,<1.6' - - python: "3.4" - env: DJANGO_VERSION='Django>=1.6,<1.7' - - python: "3.4" + - python: "3.6" + env: DJANGO_VERSION='Django>=1.11,<2.0' + - python: "3.6" + env: DJANGO_VERSION='Django>=2.0,<2.1' + - python: "3.6" + env: DJANGO_VERSION='Django>=2.1,<2.2' + - python: "3.6" env: DJANGO_VERSION='https://github.com/django/django/archive/master.tar.gz' - - python: "3.5" - env: DJANGO_VERSION='Django>=1.4,<1.5' - - python: "3.5" - env: DJANGO_VERSION='Django>=1.5,<1.6' - - python: "3.5" - env: DJANGO_VERSION='Django>=1.6,<1.7' - - python: "3.5" - env: DJANGO_VERSION='Django>=1.7,<1.8' - - python: "3.6" - env: DJANGO_VERSION='Django>=1.4,<1.5' - - python: "3.6" - env: DJANGO_VERSION='Django>=1.5,<1.6' - - python: "3.6" - env: DJANGO_VERSION='Django>=1.6,<1.7' - - python: "3.6" - env: DJANGO_VERSION='Django>=1.7,<1.8' - - python: "3.6" - env: DJANGO_VERSION='Django>=1.8,<1.9' - - python: "3.6" - env: DJANGO_VERSION='Django>=1.9,<1.10' - - python: "3.6" - env: DJANGO_VERSION='Django>=1.10,<1.11' allow_failures: - env: DJANGO_VERSION='https://github.com/django/django/archive/master.tar.gz' diff --git a/README.rst b/README.rst index f1daad0..628dbad 100644 --- a/README.rst +++ b/README.rst @@ -14,9 +14,9 @@ A new model field and form field. With this you can get a multiple select from a This egg is inspired by this `snippet `_. -Supported Python versions: 2.6, 2.7, 3.3+ +Supported Python versions: 2.7, 3.4+ -Supported Django versions: 1.4-1.11+ +Supported Django versions: 1.11-2.0+ Installation ============ diff --git a/setup.py b/setup.py index 6a8c581..acf9632 100644 --- a/setup.py +++ b/setup.py @@ -41,13 +41,12 @@ setup( 'Framework :: Django', 'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)', 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', ], license="LGPL 3", keywords="django,multiple,select,field,choices", @@ -55,13 +54,13 @@ setup( packages=find_packages(), include_package_data=True, tests_require=[ - 'django>=1.4', + 'django>=1.11', 'tox', 'coverage', 'flake8', ], install_requires=[ - 'django>=1.4', + 'django>=1.11', ], zip_safe=False, ) diff --git a/tox.ini b/tox.ini index 72bbf3f..08b8f0b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py26-dj14,py26-dj15,py26-dj16,py27-dj14,py27-dj15,py27-dj16,py27-dj17,py27-dj18,py27-dj19,py27-dj110,py33-dj16,py33-dj17,py33-dj18,py34-dj17,py34-dj18,py34-dj19,py34-dj110,py35-dj18,py35-dj19,py35-dj110 +envlist = py{27,34,35,36}-dj111,py{34,35,36,37}-dj20,py{35,36,37}-dj21 [testenv] usedevelop = True @@ -12,186 +12,104 @@ commands = install_command = pip install {opts} {packages} -[testenv:py26-dj14] -basepython = python2.6 -deps = - django==1.4.22 - pillow==1.7.8 - PyYAML==3.10 - coveralls==0.3 - flake8 - -[testenv:py26-dj15] -basepython = python2.6 -deps = - django==1.5.12 - pillow==1.7.8 - PyYAML==3.10 - coveralls==0.3 - flake8 - -[testenv:py26-dj16] -basepython = python2.6 -deps = - django==1.6.11 - pillow==1.7.8 - PyYAML==3.10 - coveralls==0.3 - flake8 - - -[testenv:py27-dj14] +[testenv:py27-dj111] basepython = python2.7 deps = - django==1.4.22 + django==1.11.15 pillow==1.7.8 - PyYAML==3.10 - coveralls==0.3 - flake8 - -[testenv:py27-dj15] -basepython = python2.7 -deps = - django==1.5.12 - pillow==1.7.8 - PyYAML==3.10 - coveralls==0.3 - flake8 - -[testenv:py27-dj16] -basepython = python2.7 -deps = - django==1.6.11 - pillow==1.7.8 - PyYAML==3.10 - coveralls==0.3 - flake8 - -[testenv:py27-dj17] -basepython = python2.7 -deps = - django==1.7.11 - pillow==1.7.8 - PyYAML==3.10 - coveralls==0.3 - flake8 - -[testenv:py27-dj18] -basepython = python2.7 -deps = - django==1.8.17 - pillow==1.7.8 - PyYAML==3.10 - coveralls==0.3 - flake8 - -[testenv:py27-dj19] -basepython = python2.7 -deps = - django==1.9.12 - pillow==1.7.8 - PyYAML==3.10 - coveralls==0.3 - flake8 - -[testenv:py27-dj110] -basepython = python2.7 -deps = - django==1.10.4 - pillow==1.7.8 - PyYAML==3.10 + PyYAML==3.13 coveralls==0.3 flake8 -[testenv:py33-dj16] -basepython = python3.3 -deps = - django==1.6.11 - pillow==2.1.0 - PyYAML==3.10 - coveralls==0.3 - flake8 - -[testenv:py33-dj17] -basepython = python3.3 -deps = - django==1.7.11 - pillow==2.1.0 - PyYAML==3.10 - coveralls==0.3 - flake8 - -[testenv:py33-dj18] -basepython = python3.3 -deps = - django==1.8.17 - pillow==2.1.0 - PyYAML==3.10 - coveralls==0.3 - flake8 - - -[testenv:py34-dj17] +[testenv:py34-dj111] basepython = python3.4 deps = - django==1.7.11 + django==1.11.15 pillow==2.1.0 - PyYAML==3.10 + PyYAML==3.13 coveralls==0.3 flake8 -[testenv:py34-dj18] +[testenv:py34-dj20] basepython = python3.4 deps = - django==1.8.17 + django==2.0.8 pillow==2.1.0 - PyYAML==3.10 - coveralls==0.3 - flake8 - -[testenv:py34-dj19] -basepython = python3.4 -deps = - django==1.9.12 - pillow==2.1.0 - PyYAML==3.10 - coveralls==0.3 - flake8 - -[testenv:py34-dj110] -basepython = python3.4 -deps = - django==1.10.4 - pillow==2.1.0 - PyYAML==3.10 + PyYAML==3.13 coveralls==0.3 flake8 -[testenv:py35-dj18] +[testenv:py35-dj111] basepython = python3.5 deps = - django==1.8.17 + django==1.11.15 pillow==2.1.0 - PyYAML==3.10 + PyYAML==3.13 coveralls==0.3 flake8 -[testenv:py35-dj19] +[testenv:py35-dj20] basepython = python3.5 deps = - django==1.9.12 + django==2.0.8 pillow==2.1.0 - PyYAML==3.10 + PyYAML==3.13 coveralls==0.3 flake8 -[testenv:py35-dj110] +[testenv:py35-dj21] basepython = python3.5 deps = - django==1.10.4 + django==2.1.1 pillow==2.1.0 - PyYAML==3.10 + PyYAML==3.13 coveralls==0.3 flake8 + +[testenv:py36-dj111] +basepython = python3.6 +deps = + django==1.11.15 + pillow==2.1.0 + PyYAML==3.13 + coveralls==0.3 + flake8 + +[testenv:py36-dj20] +basepython = python3.6 +deps = + django==2.0.8 + pillow==2.1.0 + PyYAML==3.13 + coveralls==0.3 + flake8 + +[testenv:py36-dj21] +basepython = python3.6 +deps = + django==2.1.1 + pillow==2.1.0 + PyYAML==3.13 + coveralls==0.3 + flake8 + + +[testenv:py37-dj20] +basepython = python3.7 +deps = + django==2.0.8 + pillow==2.1.0 + PyYAML==3.13 + coveralls==0.3 + flake8 + +[testenv:py37-dj21] +basepython = python3.7 +deps = + django==2.1.1 + pillow==2.1.0 + PyYAML==3.13 + coveralls==0.3 + flake8 \ No newline at end of file