Skip to content

Commit 52f6b92

Browse files
EarthmanTEarthmanT
authored
Merge pull request #38 from cloudify-cosmo/1.5.5-build
update requirements
2 parents 1d83ef3 + 6adf3c8 commit 52f6b92

12 files changed

+184
-43
lines changed

‎.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,9 @@ target/
5656
*.iml
5757
# Cloudify
5858
*.wgn
59+
60+
cloudify-utilities-plugins-sdk
61+
fusion-agent
62+
fusion-common
63+
fusion-manager
64+

‎Makefile‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
download:
2+
ifeq (,$(wildcard ./fusion-agent))
3+
git clone https://${GH_USER}:${GITHUB_PASSWORD}@eos2git.cec.lab.emc.com/ISG-Edge/fusion-agent.git && cd './fusion-agent' && git checkout rel/magicp1-2.0.0 && cd ..
4+
endif
5+
ifeq (,$(wildcard ./fusion-common))
6+
git clone https://${GH_USER}:${GITHUB_PASSWORD}@eos2git.cec.lab.emc.com/ISG-Edge/fusion-common.git && cd './fusion-common' && git checkout rel/magicp1-2.0.0 && cd ..
7+
endif
8+
ifeq (,$(wildcard ./fusion-manager))
9+
git clone https://${GH_USER}:${GITHUB_PASSWORD}@eos2git.cec.lab.emc.com/ISG-Edge/fusion-manager.git && cd './fusion-manager' && git checkout rel/magicp1-2.0.0 && cd ..
10+
endif
11+
ifeq (,$(wildcard ./cloudify-utilities-plugins-sdk))
12+
git clone https://github.com/cloudify-incubator/cloudify-utilities-plugins-sdk.git && cd './cloudify-utilities-plugins-sdk' && git checkout fusion && cd ..
13+
endif

‎constraints.txt‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎dev-requirements.txt‎

Whitespace-only changes.

‎extra-packaging-instructions.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,4 @@ EOF
1010
touch ./webbrowser/__init__.py
1111
cat <<EOF > ./webbrowser/__init__.py
1212
EOF
13-
git apply python311.patch
14-
echo patch applied
1513
fi

‎python311.patch‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎requirements-3.6.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
pyyaml>=6.0
2+
cloudify-common>=5.1.0,<7.0.0

‎requirements-3.6.txt‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
#
2+
# This file is autogenerated by pip-compile with python 3.6
3+
# To update, run:
4+
#
5+
# pip-compile --no-emit-index-url --output-file=requirements-3.6.txt requirements-3.6.in setup.py
6+
#
7+
aiohttp==3.7.4.post0
8+
# via cloudify-common
9+
async-timeout==3.0.1
10+
# via aiohttp
11+
attrs==22.2.0
12+
# via aiohttp
13+
bottle==0.12.19
14+
# via cloudify-common
15+
certifi==2023.11.17
16+
# via requests
17+
chardet==4.0.0
18+
# via aiohttp
19+
charset-normalizer==2.0.12
20+
# via requests
21+
cloudify-common==6.4.2.0
22+
# via
23+
# -r requirements-3.6.in
24+
# cloudify-host-pool-plugin (setup.py)
25+
fasteners==0.17.3
26+
# via cloudify-common
27+
idna==3.6
28+
# via
29+
# idna-ssl
30+
# requests
31+
# yarl
32+
idna-ssl==1.1.0
33+
# via aiohttp
34+
jinja2==2.11.3
35+
# via cloudify-common
36+
markupsafe==2.0.1
37+
# via jinja2
38+
multidict==5.2.0
39+
# via
40+
# aiohttp
41+
# yarl
42+
pika==1.1.0
43+
# via cloudify-common
44+
pkginfo==1.9.6
45+
# via wagon
46+
proxy_tools==0.1.0
47+
# via cloudify-common
48+
pytz==2021.3
49+
# via cloudify-common
50+
pyyaml==6.0.1
51+
# via -r requirements-3.6.in
52+
requests==2.27.1
53+
# via
54+
# cloudify-common
55+
# cloudify-host-pool-plugin (setup.py)
56+
# requests-toolbelt
57+
requests_toolbelt==0.9.1
58+
# via cloudify-common
59+
retrying==1.3.3
60+
# via cloudify-common
61+
six==1.16.0
62+
# via retrying
63+
typing-extensions==4.1.1
64+
# via
65+
# aiohttp
66+
# yarl
67+
urllib3==1.26.18
68+
# via requests
69+
wagon==1.0.1
70+
# via cloudify-common
71+
wheel==0.37.1
72+
# via wagon
73+
yarl==1.7.2
74+
# via aiohttp

‎requirements.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
pyyaml>=6.0
2+
-e fusion-common

‎requirements.txt‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.11
3+
# by the following command:
4+
#
5+
# pip-compile --no-emit-index-url --output-file=requirements.txt requirements.in setup.py
6+
#
7+
-e fusion-common
8+
# via
9+
# -r requirements.in
10+
# cloudify-host-pool-plugin (setup.py)
11+
aiohttp==3.9.1
12+
# via fusion-common
13+
aiosignal==1.3.1
14+
# via aiohttp
15+
attrs==23.1.0
16+
# via aiohttp
17+
bottle==0.12.25
18+
# via fusion-common
19+
certifi==2023.11.17
20+
# via requests
21+
charset-normalizer==3.3.2
22+
# via requests
23+
distro==1.8.0
24+
# via fusion-common
25+
fasteners==0.19
26+
# via fusion-common
27+
frozenlist==1.4.0
28+
# via
29+
# aiohttp
30+
# aiosignal
31+
idna==3.6
32+
# via
33+
# requests
34+
# yarl
35+
jinja2==3.1.2
36+
# via fusion-common
37+
markupsafe==2.1.3
38+
# via jinja2
39+
multidict==6.0.4
40+
# via
41+
# aiohttp
42+
# yarl
43+
pika==1.3.2
44+
# via fusion-common
45+
pkginfo==1.9.6
46+
# via wagon
47+
proxy-tools==0.1.0
48+
# via fusion-common
49+
pytz==2023.3.post1
50+
# via fusion-common
51+
pyyaml==6.0.1
52+
# via -r requirements.in
53+
requests==2.31.0
54+
# via
55+
# cloudify-host-pool-plugin (setup.py)
56+
# fusion-common
57+
# requests-toolbelt
58+
requests-toolbelt==1.0.0
59+
# via fusion-common
60+
urllib3==2.1.0
61+
# via requests
62+
wagon==1.0.1
63+
# via fusion-common
64+
wheel==0.42.0
65+
# via wagon
66+
yarl==1.9.3
67+
# via aiohttp

0 commit comments

Comments
 (0)