From 0e0a2d7566d27e37f53e40305cefbd8f7cfbde67 Mon Sep 17 00:00:00 2001 From: Hideo Hattori Date: Sun, 28 Jul 2019 11:37:46 +0900 Subject: [PATCH 1/9] use pypy3.5 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6340aba..150c157 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ matrix: env: TOXENV=py37 dist: xenial sudo: true - - python: pypy + - python: pypy3.5 env: TOXENV=pypy - python: 3.7 env: TOXENV=flake8 From 940b526169cd99695d1901a46c7b30c120880c1c Mon Sep 17 00:00:00 2001 From: Hideo Hattori Date: Sun, 28 Jul 2019 11:43:21 +0900 Subject: [PATCH 2/9] drop support Python2.7 and Python3.4 --- .travis.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 150c157..777341c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,6 @@ language: python matrix: include: - # Drop Support py26 - # - python: 2.6 - # env: TOXENV=py26 - - python: 2.7 - env: TOXENV=py27 - # Drop Support py32 - # - python: 3.4 - # env: TOXENV=py32 - # tox drop support py33 - # - python: 3.3 - # env: TOXENV=py33 - - python: 3.4 - env: TOXENV=py34 - python: 3.5 env: TOXENV=py35 - python: 3.6 From 9e342de958630343e1c06bcb45b2edd12a5c14e9 Mon Sep 17 00:00:00 2001 From: Hideo Hattori Date: Sun, 28 Jul 2019 12:03:41 +0900 Subject: [PATCH 3/9] test py27 --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 777341c..93ffa6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ language: python matrix: include: + - python: 2.7 + env: TOXENV=py27 - python: 3.5 env: TOXENV=py35 - python: 3.6 @@ -23,8 +25,8 @@ before_install: - git submodule update --init install: - pip install tox + - if test "$TOXENV" = py27 ; then pip install --upgrade "pytest<5.0.0"; fi - if test "$TOXENV" = py37 ; then pip install coveralls ; fi - # - if test "$TOXENV" = py32 ; then pip install --upgrade "virtualenv<14.0.0" "setuptools<30.0.0"; fi - python setup.py dataset script: - tox From b47d403e9fd222995730126d1931169202b15f27 Mon Sep 17 00:00:00 2001 From: Hideo Hattori Date: Sun, 28 Jul 2019 14:00:41 +0900 Subject: [PATCH 4/9] specific py27 test command --- tox.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tox.ini b/tox.ini index c32f486..56e3595 100644 --- a/tox.ini +++ b/tox.ini @@ -5,6 +5,10 @@ envlist=py27,py34,py35,py36,py37,pypy,flake8,mypy,autopep8 commands= python setup.py test +[testenv:py27] +commands= + pip install --upgrade "pytest<5.0.0" && python setup.py test + [testenv:flake8] deps = flake8 commands= From c50e5d28a3bdd4766c4d31bc381dcc4816c64ea5 Mon Sep 17 00:00:00 2001 From: Hideo Hattori Date: Sun, 28 Jul 2019 14:03:05 +0900 Subject: [PATCH 5/9] fix --- tox.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 56e3595..a8e4e29 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,8 @@ commands= [testenv:py27] commands= - pip install --upgrade "pytest<5.0.0" && python setup.py test + pip install --upgrade "pytest<5.0.0" + python setup.py test [testenv:flake8] deps = flake8 From 000176358b0b98595bf45e9be1f963d087a73759 Mon Sep 17 00:00:00 2001 From: Hideo Hattori Date: Sun, 28 Jul 2019 14:04:33 +0900 Subject: [PATCH 6/9] use deps --- tox.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index a8e4e29..6f86f63 100644 --- a/tox.ini +++ b/tox.ini @@ -6,9 +6,9 @@ commands= python setup.py test [testenv:py27] -commands= - pip install --upgrade "pytest<5.0.0" - python setup.py test +deps = + pytest<5.0.0 +commands = python setup.py test [testenv:flake8] deps = flake8 From c2070590f04e5e820ff199fd30e873bba6221c3a Mon Sep 17 00:00:00 2001 From: Hideo Hattori Date: Sun, 28 Jul 2019 14:05:41 +0900 Subject: [PATCH 7/9] drop py34 --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 6f86f63..b0424a6 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist=py27,py34,py35,py36,py37,pypy,flake8,mypy,autopep8 +envlist=py27,py35,py36,py37,pypy,flake8,mypy,autopep8 [testenv] commands= From 9167c70be3d553c11811574fbb9dd71e87d1983b Mon Sep 17 00:00:00 2001 From: Hideo Hattori Date: Sun, 28 Jul 2019 14:06:18 +0900 Subject: [PATCH 8/9] remove 3.3 and 3.4 in classifiers --- setup.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/setup.py b/setup.py index de4f57a..1362773 100644 --- a/setup.py +++ b/setup.py @@ -23,8 +23,6 @@ "Programming Language :: Python :: 2", "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", From 6d6bef3045cbbdf28c3e8142fc0913985ac7e777 Mon Sep 17 00:00:00 2001 From: Hideo Hattori Date: Sun, 28 Jul 2019 14:07:20 +0900 Subject: [PATCH 9/9] remove not needed command --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 93ffa6a..007d7f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,6 @@ before_install: - git submodule update --init install: - pip install tox - - if test "$TOXENV" = py27 ; then pip install --upgrade "pytest<5.0.0"; fi - if test "$TOXENV" = py37 ; then pip install coveralls ; fi - python setup.py dataset script: