Skip to content

Commit ce2a59a

Browse files
tehasdftehasdf
authored
RND-625 Compile requirements.txt (#1480)
* pip-compile actual requirements.txt * CI/builds: use reqs.txt, not dev-reqs.txt
1 parent e4b2e7a commit ce2a59a

7 files changed

Lines changed: 130 additions & 7 deletions

File tree

‎.circleci/config.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ commands:
2626
steps:
2727
- restore_cache:
2828
keys:
29-
- << parameters.cache_prefix >>-venv-{{ checksum "dev-requirements.txt" }}-{{ checksum "test-requirements.txt" }}-{{ checksum "setup.py" }}
30-
- run: ~/venv/bin/pip install -r dev-requirements.txt
29+
- << parameters.cache_prefix >>-venv-{{ checksum "requirements.txt" }}-{{ checksum "test-requirements.txt" }}-{{ checksum "setup.py" }}
30+
- run: ~/venv/bin/pip install -r requirements.txt
3131
- run: ~/venv/bin/pip install -r test-requirements.txt
3232
- run: ~/venv/bin/pip install -e .
3333
- save_cache:
3434
paths:
3535
- /home/circleci/venv
36-
key: << parameters.cache_prefix >>-venv-{{ checksum "dev-requirements.txt" }}-{{ checksum "test-requirements.txt" }}-{{ checksum "setup.py" }}
36+
key: << parameters.cache_prefix >>-venv-{{ checksum "requirements.txt" }}-{{ checksum "test-requirements.txt" }}-{{ checksum "setup.py" }}
3737
pytest:
3838
steps:
3939
- run:

‎jenkins/Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
def install_test_dependencies() {
22
echo 'installing test dependencies'
33
sh """#!/bin/bash
4-
~/venv/bin/pip install -r dev-requirements.txt
4+
~/venv/bin/pip install -r requirements.txt
55
~/venv/bin/pip install -r test-requirements.txt
66
~/venv/bin/pip install -e .
77
"""

‎packaging/cloudify-cli.spec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ sudo tar xf %{S:0} -C /
3838
/opt/cfy/python3.11/bin/python3.11 -m venv %_cli_env
3939

4040
%_cli_env/bin/pip install --upgrade pip
41-
%_cli_env/bin/pip install -r "${RPM_SOURCE_DIR}/dev-requirements.txt"
41+
%_cli_env/bin/pip install -r "${RPM_SOURCE_DIR}/requirements.txt"
4242
%_cli_env/bin/pip install "${RPM_SOURCE_DIR}"
4343

4444

‎packaging/debian/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ tar xf cfy-python3.11.tgz -C /
3737
/opt/cfy/python3.11/bin/python3.11 -m venv /opt/cfy
3838

3939
/opt/cfy/bin/pip install --upgrade pip setuptools
40-
/opt/cfy/bin/pip install -r "${PROJECT_DIR}/dev-requirements.txt"
40+
/opt/cfy/bin/pip install -r "${PROJECT_DIR}/requirements.txt"
4141
/opt/cfy/bin/pip install "${PROJECT_DIR}"
4242
cp /opt/cfy "${BUILD_DIR}/opt/cfy" -fr
4343

‎packaging/windows/win_cli_builder.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ run $CLI_PATH\python.exe get-pip.py pip==$PIP_VERSION
107107

108108
Write-Host "Installing CLI"
109109
pushd cloudify-cli
110-
run $CLI_PATH\scripts\pip.exe install --prefix="$CLI_PATH" -r dev-requirements.txt
110+
run $CLI_PATH\scripts\pip.exe install --prefix="$CLI_PATH" -r requirements.txt
111111
run $CLI_PATH\scripts\pip.exe install --prefix="$CLI_PATH" .
112112
popd
113113

dev-requirements.txt renamed to requirements.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
https://github.com/cloudify-cosmo/cloudify-common/archive/master.zip#egg=cloudify-common[dispatcher]
2+
# Pin urllib3 to the version which does not depend on appengine
3+
urllib3<1.27,>=1.21.1

‎requirements.txt‎

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.11
3+
# by the following command:
4+
#
5+
# pip-compile --output-file=requirements.txt requirements.in setup.py
6+
#
7+
aiohttp==3.8.4
8+
# via cloudify-common
9+
aiosignal==1.3.1
10+
# via aiohttp
11+
async-timeout==4.0.2
12+
# via aiohttp
13+
attrs==23.1.0
14+
# via aiohttp
15+
backports-shutil-get-terminal-size==1.0.0
16+
# via cloudify (setup.py)
17+
bcrypt==4.0.1
18+
# via paramiko
19+
bottle==0.12.23
20+
# via cloudify-common
21+
certifi==2023.5.7
22+
# via requests
23+
cffi==1.15.1
24+
# via
25+
# cryptography
26+
# pynacl
27+
charset-normalizer==3.1.0
28+
# via
29+
# aiohttp
30+
# requests
31+
click==8.1.3
32+
# via
33+
# click-didyoumean
34+
# cloudify (setup.py)
35+
click-didyoumean==0.3.0
36+
# via cloudify (setup.py)
37+
cloudify-common @ https://github.com/cloudify-cosmo/cloudify-common/archive/master.zip
38+
# via
39+
# -r requirements.in
40+
# cloudify (setup.py)
41+
colorama==0.4.4
42+
# via cloudify (setup.py)
43+
cryptography==39.0.2
44+
# via
45+
# cloudify (setup.py)
46+
# paramiko
47+
distlib==0.3.6
48+
# via virtualenv
49+
distro==1.8.0
50+
# via cloudify-common
51+
fabric==2.7.1
52+
# via cloudify (setup.py)
53+
fasteners==0.17.3
54+
# via cloudify-common
55+
filelock==3.12.0
56+
# via virtualenv
57+
frozenlist==1.3.3
58+
# via
59+
# aiohttp
60+
# aiosignal
61+
idna==3.4
62+
# via
63+
# requests
64+
# yarl
65+
invoke==1.7.3
66+
# via fabric
67+
jinja2==3.1.2
68+
# via cloudify-common
69+
markupsafe==2.1.2
70+
# via jinja2
71+
multidict==6.0.4
72+
# via
73+
# aiohttp
74+
# yarl
75+
networkx==2.8.8
76+
# via cloudify-common
77+
paramiko==3.1.0
78+
# via fabric
79+
pathlib2==2.3.7.post1
80+
# via fabric
81+
pika==1.3.0
82+
# via cloudify-common
83+
platformdirs==3.5.0
84+
# via virtualenv
85+
proxy-tools==0.1.0
86+
# via cloudify-common
87+
pycparser==2.21
88+
# via cffi
89+
pynacl==1.5.0
90+
# via paramiko
91+
pytz==2022.2.1
92+
# via cloudify-common
93+
pyyaml==6.0
94+
# via cloudify-common
95+
requests==2.30.0
96+
# via
97+
# cloudify (setup.py)
98+
# cloudify-common
99+
# requests-toolbelt
100+
requests-toolbelt==0.9.1
101+
# via cloudify-common
102+
retrying==1.3.3
103+
# via cloudify (setup.py)
104+
six==1.16.0
105+
# via
106+
# pathlib2
107+
# retrying
108+
urllib3==1.26.15
109+
# via
110+
# -r requirements.in
111+
# requests
112+
virtualenv==20.23.0
113+
# via wagon
114+
wagon[venv]==0.12.0
115+
# via
116+
# cloudify (setup.py)
117+
# cloudify-common
118+
wheel==0.40.0
119+
# via wagon
120+
yarl==1.9.2
121+
# via aiohttp

0 commit comments

Comments
 (0)