Skip to content

Commit feb82c4

Browse files
authored
Update requirements (#46)
* [x] Use setuptools compatibility list from OpenStack * [x] six >=1.10.0 * [x] Python >= 2.7.5 (drop pre-historic) * [x] dep-graph check made really simple * [x] build python 2 wheel using PyPy Signed-off-by: Alexey Stepanov <penguinolog@gmail.com>
1 parent 3c16704 commit feb82c4

File tree

5 files changed

+19
-13
lines changed

5 files changed

+19
-13
lines changed

.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ python:
66
- 3.4
77
- 3.5
88
- &mainstream_python 3.6
9-
- pypy
9+
- &pypy pypy
1010
- pypy3.5
1111
install:
1212
- &upgrade_python_toolset pip install --upgrade pip setuptools wheel
@@ -42,7 +42,8 @@ jobs:
4242
- stage: deploy
4343
# This prevents job from appearing in test plan unless commit is tagged:
4444
if: tag IS present
45-
python: *mainstream_python
45+
# Run on pypy to build not cythonized wheel
46+
python: *pypy
4647
services:
4748
- docker
4849
install:
@@ -61,7 +62,7 @@ jobs:
6162
secure: "maml4+SU/6NtRf7JIwWhVyXkesE9Gk5Umdo3txOjcrcvt84S3NlN/hFgdNclMUpJ3b+rOFEpiZOamtDKbP67uhlA6yJ364SxW5T3ZQJ8tjFFzMHcaM38HgGbgLR8AxK8fdZKRg9gVMnGofeiusB5aNsKmn9XnvESc8dNv0Umdmi83wXxm+DfVRXL8VTFgwsH3BxQy/Kdv6upRrXyNWkyoi8Zk8PkrFFDpFoW9WK1fRBqnvCw1Wt8nEAJah7y2b7vj52eM+MfT3IL+jpocZqOJQlFPdWkTonX7mAP9nB97kk4DMbm3ZqUw2Qr9pM0nKK9HhrXhsSSUGa1w95zmw9nbXLrpfnQ61Lyk9pGcVh60WbrVKstE/x9Lq3pqGsA/YKqsIZK3OAqRfBHNG9L7lekP05hXyDNHJXGoEyGQjVA/666S2ZCjM10XaaUmZ5P1kPGocCnEjv86dKdINTkFM6L0n4oIu1nyftBhVu9jz0xQaxute4LZNJiQtE6x8NX3WuSO68UhWjDqevYdRgW55Gp1OD4ilfA/SVNPpsHJfB2baue1fi9m8Rn3bWQSJoZ8twYHoIxEOAIXyMBhYnmldvsuUY6h5p+/hk6kpJAsTXZFjUSa/FPIH84QvDkNCoZxwInSkjEN1tj9PBep2vYcLMd92+g6udtin8FbYMZItiDl1M="
6263
on:
6364
tags: true
64-
distributions: sdist
65+
distributions: sdist bdist_wheel
6566
skip_upload_docs: true
6667

6768
cache: pip

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
# Minimum requirements for the build system to execute.
33
# PEP 508 specifications for PEP 518.
44
requires = [
5-
"setuptools > 20.2 ",
5+
"setuptools >= 21.0.0,!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0", # PSF/ZPL
66
"wheel",
77
]

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
paramiko>=2.4 # LGPLv2.1+
2-
tenacity>=3.2.1 # Apache-2.0
3-
six>=1.9.0 # MIT
2+
tenacity>=4.4.0 # Apache-2.0
3+
six>=1.10.0 # MIT
44
threaded>=1.0 # Apache-2.0
55
PyYAML>=3.12 # MIT
66
advanced-descriptors>=1.0 # Apache-2.0

setup.cfg

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,17 @@ long_description = file: README.rst
66
[options]
77
zip_safe = False
88
packages = find:
9+
10+
# While setuptools cannot deal with pre-installed incompatible versions,
11+
# setting a lower bound is not harmful - it makes error messages cleaner. DO
12+
# NOT set an upper bound on setuptools, as that will lead to uninstallable
13+
# situations as progressive releases of projects are done.
14+
# Blacklist setuptools 34.0.0-34.3.2 due to https://github.com/pypa/setuptools/issues/951
15+
# Blacklist setuptools 36.2.0 due to https://github.com/pypa/setuptools/issues/1086
916
setup_requires =
10-
setuptools > 20.2
17+
setuptools >= 21.0.0,!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0
1118

12-
python_requires = >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*
19+
python_requires = >=2.7.5,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*
1320

1421
[bdist_wheel]
1522
# This flag says that the code is written to work on both Python 2 and Python

tox.ini

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,7 @@ deps = bandit
137137
commands = bandit -r exec_helpers
138138

139139
[testenv:dep-graph]
140-
envdir = {toxworkdir}/dep-graph
141140
deps =
142-
pipenv
143-
commands =
144-
pipenv install -r {toxinidir}/build_requirements.txt --skip-lock
145-
pipenv graph
141+
.
142+
pipdeptree
143+
commands = pipdeptree

0 commit comments

Comments
 (0)