Skip to content

Commit 7273960

Browse files
hjmodihjmodi
committed
make requirements cachito complient
CLOUDBLD-7559 Signed-off-by: Harsh Modi <[email protected]>
1 parent 5aaf192 commit 7273960

11 files changed

+807
-41
lines changed

‎requirements-build.in

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Generated by pip_find_builddeps.py on Oct 20 2021 09:32:35
2+
Cython
3+
cffi>=1.12
4+
flit_core<4,>=3.2.0
5+
packaging>=20.0
6+
poetry-core
7+
pycparser
8+
pyparsing>=2.0.2
9+
semantic-version>=2.6.0
10+
setuptools-rust>=0.11.4
11+
# pin setuptools to avoid issue when building with cachito
12+
setuptools<54.0.0
13+
setuptools_scm
14+
setuptools_scm[toml]>=3.4
15+
# pin tomli to avoid issue when building with cachito
16+
tomli==1.0.1
17+
wheel

‎requirements-build.txt

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
#
2+
# This file is autogenerated by pip-compile with python 3.8
3+
# To update, run:
4+
#
5+
# pip-compile --allow-unsafe --output-file=requirements-build.txt requirements-build.in
6+
#
7+
cffi==1.15.0
8+
# via -r requirements-build.in
9+
cython==0.29.24
10+
# via -r requirements-build.in
11+
flit-core==3.4.0
12+
# via -r requirements-build.in
13+
packaging==21.0
14+
# via
15+
# -r requirements-build.in
16+
# setuptools-scm
17+
poetry-core==1.0.7
18+
# via -r requirements-build.in
19+
pycparser==2.20
20+
# via
21+
# -r requirements-build.in
22+
# cffi
23+
pyparsing==2.4.7
24+
# via
25+
# -r requirements-build.in
26+
# packaging
27+
semantic-version==2.8.5
28+
# via
29+
# -r requirements-build.in
30+
# setuptools-rust
31+
setuptools-rust==0.12.1
32+
# via -r requirements-build.in
33+
setuptools-scm[toml]==6.3.2
34+
# via -r requirements-build.in
35+
toml==0.10.2
36+
# via setuptools-rust
37+
tomli==1.0.1
38+
# via
39+
# -r requirements-build.in
40+
# flit-core
41+
# setuptools-scm
42+
wheel==0.37.0
43+
# via -r requirements-build.in
44+
45+
# The following packages are considered to be unsafe in a requirements file:
46+
setuptools==53.1.0
47+
# via
48+
# -r requirements-build.in
49+
# setuptools-rust
50+
# setuptools-scm

‎requirements-devel.in

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
-r requirements.in
2+
-r tests/requirements.in
3+
pyflakes
4+
pep8

‎requirements-devel.txt

+417-4
Large diffs are not rendered by default.

‎requirements-pip.in

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# we need to add pip here so that cachito can provide it and
2+
# we can upgrade to latest pip in UBI 8 and avoid install issues
3+
pip

‎requirements-pip.txt

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#
2+
# This file is autogenerated by pip-compile with python 3.8
3+
# To update, run:
4+
#
5+
# pip-compile --allow-unsafe --generate-hashes --output-file=requirements-pip.txt requirements-pip.in
6+
#
7+
8+
# The following packages are considered to be unsafe in a requirements file:
9+
pip==21.3 \
10+
--hash=sha256:4a1de8f97884ecfc10b48fe61c234f7e7dcf4490a37217011ad9369d899ad5a6 \
11+
--hash=sha256:741a61baab1dbce2d8ca415effa48a2b6a964564f81a9f4f1fce4c433346c034
12+
# via -r requirements-pip.in

‎requirements.in

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
backoff
2+
docker < 4.3.0
3+
docker-squash>=1.0.7
4+
dockerfile-parse>=0.0.13
5+
flatpak-module-tools >= 0.11,<0.13;python_version<"3.9"
6+
flatpak-module-tools >= 0.11;python_version>="3.9"
7+
jsonschema
8+
PyYAML
9+
ruamel.yaml
10+
git+https://github.com/containerbuildsystem/osbs-client@be934592d8c2a90c186bdab619a1dffb71cf62c1#egg=osbs-client
11+
# cannot build cryptography with rust for version >= 3.5
12+
cryptography < 3.5
13+
requests

‎requirements.txt

+75-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,75 @@
1-
backoff
2-
docker < 4.3.0
3-
docker-squash>=1.0.7
4-
dockerfile-parse>=0.0.13
5-
flatpak-module-tools >= 0.11,<0.13;python_version<"3.9"
6-
flatpak-module-tools >= 0.11;python_version>="3.9"
7-
jsonschema
8-
PyYAML
9-
ruamel.yaml
1+
#
2+
# This file is autogenerated by pip-compile with python 3.8
3+
# To update, run:
4+
#
5+
# pip-compile --allow-unsafe --output-file=requirements.txt requirements.in
6+
#
7+
attrs==21.2.0
8+
# via jsonschema
9+
backoff==1.11.1
10+
# via -r requirements.in
11+
certifi==2021.10.8
12+
# via requests
13+
cffi==1.15.0
14+
# via cryptography
15+
charset-normalizer==2.0.7
16+
# via requests
17+
cryptography==3.4.8
18+
# via
19+
# -r requirements.in
20+
# requests-kerberos
21+
docker==4.2.2
22+
# via
23+
# -r requirements.in
24+
# docker-squash
25+
docker-squash==1.0.8
26+
# via -r requirements.in
27+
dockerfile-parse==1.2.0
28+
# via
29+
# -r requirements.in
30+
# osbs-client
31+
flatpak-module-tools==0.12 ; python_version < "3.9"
32+
# via -r requirements.in
33+
idna==3.3
34+
# via requests
35+
jsonschema==4.1.1
36+
# via
37+
# -r requirements.in
38+
# osbs-client
39+
osbs-client @ git+https://github.com/containerbuildsystem/osbs-client@7b3f2c4b3583950f8fb5cc13804b0cf2115dbf84
40+
# via -r requirements.in
41+
pycparser==2.20
42+
# via cffi
43+
pykerberos==1.2.1
44+
# via requests-kerberos
45+
pyrsistent==0.18.0
46+
# via jsonschema
47+
python-dateutil==2.8.2
48+
# via osbs-client
49+
pyyaml==6.0
50+
# via
51+
# -r requirements.in
52+
# osbs-client
53+
requests==2.26.0
54+
# via
55+
# -r requirements.in
56+
# docker
57+
# osbs-client
58+
# requests-kerberos
59+
requests-kerberos==0.12.0
60+
# via osbs-client
61+
ruamel.yaml==0.17.16
62+
# via -r requirements.in
63+
ruamel.yaml.clib==0.2.6
64+
# via ruamel.yaml
65+
six==1.16.0
66+
# via
67+
# docker
68+
# docker-squash
69+
# dockerfile-parse
70+
# osbs-client
71+
# python-dateutil
72+
urllib3==1.26.7
73+
# via requests
74+
websocket-client==1.2.1
75+
# via docker

‎setup.py

+13-16
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,8 @@
77
of the BSD license. See the LICENSE file for details.
88
"""
99

10-
import re
11-
1210
from setuptools import setup, find_packages
1311

14-
1512
DESCRIPTION = "Python library with command line interface for building docker images."
1613
HOMEPAGE = "https://github.com/containerbuildsystem/atomic-reactor"
1714

@@ -25,18 +22,6 @@
2522
],
2623
}
2724

28-
29-
def _get_requirements(path):
30-
try:
31-
with open(path) as f:
32-
packages = f.read().splitlines()
33-
except (IOError, OSError) as ex:
34-
raise RuntimeError("Can't open file with requirements: %s", ex)
35-
packages = (p.strip() for p in packages if not re.match(r'^\s*#', p))
36-
packages = list(filter(None, packages))
37-
return packages
38-
39-
4025
setup(
4126
name='atomic-reactor',
4227
version='4.0.dev0',
@@ -49,7 +34,19 @@ def _get_requirements(path):
4934
'console_scripts': ['atomic-reactor=atomic_reactor.cli.main:run'],
5035
},
5136
packages=find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
52-
install_requires=_get_requirements('requirements.txt'),
37+
install_requires=[
38+
'backoff',
39+
'docker < 4.3.0',
40+
'docker-squash>=1.0.7',
41+
'dockerfile-parse>=0.0.13',
42+
'flatpak-module-tools >= 0.11,<0.13;python_version<"3.9"',
43+
'flatpak-module-tools >= 0.11;python_version>="3.9"',
44+
'jsonschema',
45+
'PyYAML',
46+
'ruamel.yaml',
47+
'osbs-client >= 1.0.0',
48+
'requests',
49+
],
5350
python_requires='>=3.8, <4',
5451
package_data={'atomic_reactor': ['schemas/*.json']},
5552
data_files=data_files.items(),

‎tests/requirements.in

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
flexmock>=0.10.6
2+
responses>=0.9.0,<0.10.8
3+
pypng
4+
# 5.0 is the minimum version required by latest version of pytest-html. As of
5+
# this update, it is 3.1.1.
6+
pytest>=5.0
7+
pytest-cov
8+
pytest-html
9+
flake8
10+
koji
11+
requests-mock

0 commit comments

Comments
 (0)