From 1119e1f22cb898b2966660c0ba5781bd15e6001a Mon Sep 17 00:00:00 2001 From: Alexey Stepanov Date: Mon, 2 Jul 2018 16:53:50 +0200 Subject: [PATCH 1/8] Build python3.7 wheels. Related #14 Travis is still do not allow to switch on the "release" tag --- .travis.yml | 4 ++-- tools/build-wheels.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ac14b6f..9d0c03a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,10 @@ python: - 2.7 - 3.4 - 3.5 -- &mainstream_python 3.6 +- 3.6 +- &mainstream_python 3.7-dev - pypy - pypy3.5 -- 3.7-dev install: - &upgrade_python_toolset pip install --upgrade pip setuptools wheel - pip install tox-travis diff --git a/tools/build-wheels.sh b/tools/build-wheels.sh index 53a19a5..b9ab7b8 100755 --- a/tools/build-wheels.sh +++ b/tools/build-wheels.sh @@ -1,5 +1,5 @@ #!/bin/bash -PYTHON_VERSIONS="cp34-cp34m cp35-cp35m cp36-cp36m" +PYTHON_VERSIONS="cp34-cp34m cp35-cp35m cp36-cp36m cp36-cp36m" # Avoid creation of __pycache__/*.py[c|o] export PYTHONDONTWRITEBYTECODE=1 From 63ebef1846dd53bffae387487e8b50f3d61f0c80 Mon Sep 17 00:00:00 2001 From: Alexey Stepanov Date: Mon, 2 Jul 2018 17:11:08 +0200 Subject: [PATCH 2/8] Fix copypaste commit: cp37-cp37m --- tools/build-wheels.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build-wheels.sh b/tools/build-wheels.sh index b9ab7b8..032245f 100755 --- a/tools/build-wheels.sh +++ b/tools/build-wheels.sh @@ -1,5 +1,5 @@ #!/bin/bash -PYTHON_VERSIONS="cp34-cp34m cp35-cp35m cp36-cp36m cp36-cp36m" +PYTHON_VERSIONS="cp34-cp34m cp35-cp35m cp36-cp36m cp37-cp37m" # Avoid creation of __pycache__/*.py[c|o] export PYTHONDONTWRITEBYTECODE=1 From 038a645f156defb19a14bef78184b640f6a5a2ca Mon Sep 17 00:00:00 2001 From: Alexey Stepanov Date: Mon, 2 Jul 2018 17:15:36 +0200 Subject: [PATCH 3/8] require typing on python 3.7 too --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b273544..f4e03a2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ six >=1.9 -typing >= 3.6 ; python_version < "3.7" +typing >= 3.6 ; python_version < "3.8" From 4eacba0443ccd0559f39b1ac126848be7c7f5b1e Mon Sep 17 00:00:00 2001 From: Alexey Stepanov Date: Tue, 3 Jul 2018 09:13:15 +0200 Subject: [PATCH 4/8] remove basepython directive from tox --- tox.ini | 2 -- 1 file changed, 2 deletions(-) diff --git a/tox.ini b/tox.ini index 51d2562..615f767 100644 --- a/tox.ini +++ b/tox.ini @@ -79,14 +79,12 @@ usedevelop = False commands = pip install ./ -vvv -U [testenv:pylint] -basepython = python3.6 deps = pylint -r{toxinidir}/CI_REQUIREMENTS.txt commands = pylint logwrap [flake8] -basepython = python3.6 exclude = .venv, .git, From 637743cf5203208ce5ffca379e63a26a232b0682 Mon Sep 17 00:00:00 2001 From: Alexey Stepanov Date: Tue, 3 Jul 2018 09:57:07 +0200 Subject: [PATCH 5/8] Call static analysis on python 3.6, force wheel for python 2.7 --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9d0c03a..9cae94a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ python: - 3.5 - 3.6 - &mainstream_python 3.7-dev -- pypy +- &pypy pypy - pypy3.5 install: - &upgrade_python_toolset pip install --upgrade pip setuptools wheel @@ -31,7 +31,7 @@ jobs: after_success: skip - stage: Code style check - python: *mainstream_python + python: 3.6 services: skip install: - *upgrade_python_toolset @@ -43,7 +43,7 @@ jobs: - stage: deploy # This prevents job from appearing in test plan unless commit is tagged: if: tag IS present - python: *mainstream_python + python: *pypy services: - docker install: @@ -52,6 +52,7 @@ jobs: - ./tools/run_docker.sh "logwrap" before_deploy: - pip install -r build_requirements.txt + - python setup.py bdist_wheel deploy: - provider: pypi # `skip_cleanup: true` is required to preserve binary wheels, built From 3a6bdeb6bf03ec54eacb2deab22dc4c760bf30e7 Mon Sep 17 00:00:00 2001 From: Alexey Stepanov Date: Tue, 3 Jul 2018 10:07:08 +0200 Subject: [PATCH 6/8] move analysis --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9cae94a..493b006 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ jobs: fast_finish: true include: - stage: Static analisys - python: *mainstream_python + python: 3.6 services: skip install: - *upgrade_python_toolset @@ -31,7 +31,7 @@ jobs: after_success: skip - stage: Code style check - python: 3.6 + python: *mainstream_python services: skip install: - *upgrade_python_toolset From f858b5db79c094b14db77357cab05a9c5682764a Mon Sep 17 00:00:00 2001 From: Alexey Stepanov Date: Tue, 3 Jul 2018 10:18:21 +0200 Subject: [PATCH 7/8] try python 3.7 release --- .travis.yml | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 493b006..6ca40a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,29 @@ -sudo: false language: python os: linux -python: -- 2.7 -- 3.4 -- 3.5 -- 3.6 -- &mainstream_python 3.7-dev -- &pypy pypy -- pypy3.5 +matrix: + include: + - python: 2.7 + dist: trusty + sudo: false + - python: 3.4 + dist: trusty + sudo: false + - python: 3.5 + dist: trusty + sudo: false + - python: 3.6 + dist: trusty + sudo: false + - python: &mainstream_python 3.7 + dist: xenial + sudo: true + - python: &pypy pypy + dist: trusty + sudo: false + - python: pypy3.5 + dist: trusty + sudo: false + install: - &upgrade_python_toolset pip install --upgrade pip setuptools wheel - pip install tox-travis From e94c711335100effdc54c74e8cb26ef76a03edb9 Mon Sep 17 00:00:00 2001 From: Alexey Stepanov Date: Tue, 3 Jul 2018 10:21:40 +0200 Subject: [PATCH 8/8] Revert "try python 3.7 release" This reverts commit f858b5d --- .travis.yml | 33 +++++++++------------------------ 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6ca40a3..493b006 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,29 +1,14 @@ +sudo: false language: python os: linux -matrix: - include: - - python: 2.7 - dist: trusty - sudo: false - - python: 3.4 - dist: trusty - sudo: false - - python: 3.5 - dist: trusty - sudo: false - - python: 3.6 - dist: trusty - sudo: false - - python: &mainstream_python 3.7 - dist: xenial - sudo: true - - python: &pypy pypy - dist: trusty - sudo: false - - python: pypy3.5 - dist: trusty - sudo: false - +python: +- 2.7 +- 3.4 +- 3.5 +- 3.6 +- &mainstream_python 3.7-dev +- &pypy pypy +- pypy3.5 install: - &upgrade_python_toolset pip install --upgrade pip setuptools wheel - pip install tox-travis