Skip to content

Commit 1284b37

Browse files
committed
Relax requirements that were pinned down because they no longer supported python 2
1 parent 13d64cd commit 1284b37

File tree

3 files changed

+31
-28
lines changed

3 files changed

+31
-28
lines changed

requirements.in

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
troposphere>=1.9.0
2+
botocore>=1.12.111
3+
boto3>=1.9.111,<2.0
4+
PyYAML>=3.13b1
5+
awacs>=0.6.0
6+
gitpython>=3.0
7+
jinja2>=2.7
8+
schematics>=2.0.1,<2.1.0
9+
formic2
10+
python-dateutil>=2.0,<3.0
11+
MarkupSafe>=2
12+
more-itertools
13+
rsa>=4.7
14+
python-jose
15+
future

setup.py

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,15 @@
55

66
src_dir = os.path.dirname(__file__)
77

8-
install_requires = [
9-
"future",
10-
"troposphere>=1.9.0",
11-
'botocore>=1.12.111', # matching boto3 requirement
12-
"boto3>=1.9.111,<2.0",
13-
"PyYAML>=3.13b1",
14-
"awacs>=0.6.0",
15-
"gitpython>=2.0,<3.0",
16-
"jinja2>=2.7,<3.0a",
17-
"schematics>=2.0.1,<2.1.0",
18-
"formic2",
19-
"python-dateutil>=2.0,<3.0",
20-
"MarkupSafe<2.0", # 2.0 dropped python 2.7, 3.5 support - temporary
21-
"more-itertools<6.0.0", # 6.0.0 dropped python 2.7 support - temporary
22-
"rsa==4.5", # 4.6 dropped python 2.7 support - temporary
23-
"python-jose<3.2.0", # 3.2.0 dropped python 2.7 support - temporary
24-
]
8+
def get_install_requirements(path):
9+
content = open(os.path.join(os.path.dirname(__file__), path)).read()
10+
return [req for req in content.split("\n") if req != "" and not req.startswith("#")]
11+
12+
install_requires = get_install_requirements("requirements.in")
2513

2614
setup_requires = ['pytest-runner']
2715

28-
tests_require = [
29-
"pytest~=4.3",
30-
"pytest-cov~=2.6",
31-
"mock~=2.0",
32-
"moto[awslambda]~=1.3.16",
33-
"testfixtures~=4.10.0",
34-
"flake8-future-import",
35-
]
16+
tests_require = get_install_requirements("test-requirements.in")
3617

3718
scripts = [
3819
"scripts/compare_env",
@@ -68,8 +49,9 @@ def read(filename):
6849
"Development Status :: 5 - Production/Stable",
6950
"Environment :: Console",
7051
"License :: OSI Approved :: BSD License",
71-
"Programming Language :: Python :: 2.7",
72-
"Programming Language :: Python :: 3.5",
73-
"Programming Language :: Python :: 3.6",
52+
"Programming Language :: Python :: 3.7",
53+
"Programming Language :: Python :: 3.8",
54+
"Programming Language :: Python :: 3.9",
55+
"Programming Language :: Python :: 3.10",
7456
],
7557
)

test-requirements.in

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pytest~=4.3
2+
pytest-cov~=2.6
3+
mock~=2.0
4+
moto[awslambda,ec2]~=3.0.0
5+
testfixtures~=4.10.0
6+
flake8

0 commit comments

Comments
 (0)