From a2ba2c81450c85926b9396fe76becb4766e56ee6 Mon Sep 17 00:00:00 2001 From: Jens Finkhaeuser Date: Fri, 8 Feb 2019 12:19:14 +0100 Subject: [PATCH] - Bump dependencies - Adjust requirements to default to click7, but allow flex with click 6.7 - Try adding python 3.7 to test matrix on travis --- .travis.yml | 3 ++- requirements.txt | 2 +- requirements_bare.txt | 1 + requirements_flex.txt | 3 ++- requirements_no_icu.txt | 2 +- requirements_no_osv_or_icu.txt | 2 +- setup.py | 40 ++++++++++++++++++++-------------- tox.ini | 16 ++++++++------ 8 files changed, 41 insertions(+), 28 deletions(-) create mode 100644 requirements_bare.txt diff --git a/.travis.yml b/.travis.yml index 9a8d51e..a32d1cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ python: - '3.4' - '3.5' - '3.6' + - '3.7' install: - pip install tox-travis script: @@ -22,7 +23,7 @@ deploy: tags: true branch: master repo: jfinkhaeuser/prance - condition: "$(python --version | grep '^Python 3\\.5')" + condition: "$(python --version | grep '^Python 3\\.6')" env: global: - secure: OBNymO/NhhWmcI/Vqs4TcxYCSPoDAblnurdjC11h0xi0OVNfddhKEIlcump3G7vZZNJucepp2SOVV8rrUE1ATbxQnZzMwAarfW61l4aoAXP1y4oZkVrDVMdXTKMU2t1iXpjU7rQSCnJ9GhLyyC8I5EJTeJR9nwhts2sh186QyJM3rnjdt8C6PULh48YvpU9sKoazShzqL0s+L8wHQeh1BTRu7DMFQwmZl+dFc1RSO/Q3hpVIBk/9cdlCixWQZzPu14Z0gjX76qsVixKJ1oB+2wVIiMDwMS1h7HGQhJTY3B47orAkiSK8EbmPBBKzqD0oNEq9e98x7V/+Hre7Hw4EoMLZHeBcyeQ998T7XbYpR1/19nVyXb8epZ6q6Uo7q5+GWUr+cDdY+d/AzGed4uOh7YD+mqn+BVg+h5JyGabRpfIAeeCbwQ5Uq9WSdVhcyDeqAwSsC2uGuMSuZaTgs0aU3uXOgZpmCPA35Qs0qVOFldeId7FU+JW+ij98/B+dgTqB7ZXCFsG+BTmYxnE3Iza6dtJoe5NEYadEXiPMZG3BBcra9UN77ltmmsfentujhkgcof1H+1o85nTY2ry6SkTICmibt7egJbiKb1jr0yn0FqBvzUKJCTqIN3gQFWeC2A2FQej2EvxMcx/QRmFPK6ylVQJjbZHsoGJs/yf9fuLlyBg= diff --git a/requirements.txt b/requirements.txt index ccd43a0..deffd82 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ --e .[dev,ssv,osv,icu] +-e .[dev,ssv,osv,icu,cli] diff --git a/requirements_bare.txt b/requirements_bare.txt new file mode 100644 index 0000000..aefbcb6 --- /dev/null +++ b/requirements_bare.txt @@ -0,0 +1 @@ +-e .[dev] diff --git a/requirements_flex.txt b/requirements_flex.txt index 1ab7971..1cce194 100644 --- a/requirements_flex.txt +++ b/requirements_flex.txt @@ -1 +1,2 @@ --e .[dev,icu] +-e .[dev,flex,icu] +click~=6.7 # for flex diff --git a/requirements_no_icu.txt b/requirements_no_icu.txt index f86b09c..39f402d 100644 --- a/requirements_no_icu.txt +++ b/requirements_no_icu.txt @@ -1 +1 @@ --e .[dev,ssv,osv] +-e .[dev,ssv,osv,cli] diff --git a/requirements_no_osv_or_icu.txt b/requirements_no_osv_or_icu.txt index 11265a9..9a3fbb4 100644 --- a/requirements_no_osv_or_icu.txt +++ b/requirements_no_osv_or_icu.txt @@ -1 +1 @@ --e .[dev,ssv] +-e .[dev,ssv,cli] diff --git a/setup.py b/setup.py index 0b71919..d8d5ca0 100644 --- a/setup.py +++ b/setup.py @@ -14,27 +14,35 @@ from distutils.core import setup, find_packages dev_require = [ - 'tox>=2.9', + 'tox>=3.7', 'bumpversion>=0.5', - 'pytest>=3.4', - 'pytest-cov>=2.5', - 'flake8>=3.5', - 'pep8-naming>=0.5', - 'flake8-quotes>=0.14', + 'pytest>=4.2', + 'pytest-cov>=2.6', + 'flake8>=3.7', + 'pep8-naming>=0.8', + 'flake8-quotes>=1.0', 'flake8_docstrings>=1.3', - 'sphinx>=1.7', + 'sphinx>=1.8', ] icu_require = [ - 'PyICU~=1.9', + 'PyICU~=2.2', ] ssv_require = [ - 'swagger-spec-validator~=2.1', + 'swagger-spec-validator~=2.4', ] osv_require = [ - 'openapi-spec-validator~=0.2,>=0.2.1', + 'openapi-spec-validator>0.2,>=0.2.1', + ] + + flex_require = [ + 'flex', + ] + + cli_require = [ + 'click~=7.0', ] # Run setup @@ -69,11 +77,9 @@ include_package_data = True, install_requires = [ 'chardet~=3.0', - 'PyYAML~=3.12', - 'flex~=6.12', - 'requests~=2.18', - 'six~=1.11', - 'click~=6.7', + 'PyYAML>4,>=4.2b4', + 'requests~=2.21', + 'six~=1.12', 'semver~=2.8', ], extras_require = { @@ -81,10 +87,12 @@ 'icu': icu_require, 'ssv': ssv_require, 'osv': osv_require, + 'flex': flex_require, + 'cli': cli_require, }, entry_points={ 'console_scripts': [ - 'prance=prance.cli:cli', + 'prance=prance.cli:cli [cli]', ], }, zip_safe = True, diff --git a/tox.ini b/tox.ini index ea8468f..8f3a01d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,26 +1,28 @@ [tox] -envlist = py{27,35}-{icu,no_icu} +envlist = py{27,36}-{icu,no_icu} [travis] python = pypy: pypy-{no_osv_or_icu} 2.7: py27-{no_osv_or_icu} 3.4: py34-{no_icu} - 3.5: py35-{icu,no_icu,flex_only} - 3.6: py36-{no_icu} + 3.5: py35-{no_icu} + 3.6: py36-{icu,no_icu,flex} + 3.7: py37-{no_icu} [testenv] # Different dependencies for environments with and without ICU deps = icu: -r{toxinidir}/requirements.txt no_icu: -r{toxinidir}/requirements_no_icu.txt - flex_only: -r{toxinidir}/requirements_flex_only.txt no_osv_or_icu: -r{toxinidir}/requirements_no_osv_or_icu.txt + flex: -r{toxinidir}/requirements_flex.txt + bare: -r{toxinidir}/requirements_bare.txt # We need to set environment variables for py3 to work with click setenv = LC_ALL=C.UTF-8 LANG=C.UTF-8 -# For Python 3.5 (main dev version), also run flake8 and sphinx +# For Python 3.6 (main dev version), also run flake8 and sphinx commands = - py{27,34,36,py}: python setup.py test - py35: python setup.py test flake8 build_sphinx + py{27,34,35,37,py}: python setup.py test + py36: python setup.py test flake8 build_sphinx