Skip to content

Commit

Permalink
skip-update-if-external (#264)
Browse files Browse the repository at this point in the history 
* skip-update-if-external

* add requirements

---------

Co-authored-by: EarthmanT <[email protected]>
  • Loading branch information
@ahmadiesa-abu @EarthmanT
ahmadiesa-abu and EarthmanT authored Dec 4, 2023
1 parent eb0300e commit b3fbb3a
Show file tree
Hide file tree
Showing 19 changed files with 556 additions and 103 deletions.
5 changes: 5 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,8 @@ cloudify_vsphere_plugin.egg-info/
*.vmdk
*.qcow2
*.wgn

fusion-agent
fusion-common
fusion-manager
cloudify-utilities-plugins-sdk
2 changes: 2 additions & 0 deletions CHANGELOG.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
2.20.12:
- Skip update on external resources.
2.20.11:
- adjust python 3.11 patch.
2.20.10:
Expand Down
13 changes: 13 additions & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
download:
ifeq (,$(wildcard ./fusion-agent))
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 ..
endif
ifeq (,$(wildcard ./fusion-common))
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 ..
endif
ifeq (,$(wildcard ./fusion-manager))
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 ..
endif
ifeq (,$(wildcard ./cloudify-utilities-plugins-sdk))
git clone https://github.com/cloudify-incubator/cloudify-utilities-plugins-sdk.git && cd './cloudify-utilities-plugins-sdk' && git checkout fusion && cd ..
endif
2 changes: 1 addition & 1 deletion cloudify_vsphere/__version__.py
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version = '2.20.11'
version = '2.20.12'
8 changes: 0 additions & 8 deletions constraints.txt
View file

This file was deleted.

4 changes: 0 additions & 4 deletions extra-packaging-instructions.sh
View file
Original file line number Diff line number Diff line change
@@ -1,4 +0,0 @@
if [[ $PY311 == 1 ]]
then
git apply python311.patch
fi
2 changes: 1 addition & 1 deletion plugin.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins:
vsphere:
executor: central_deployment_agent
package_name: cloudify-vsphere-plugin
package_version: '2.20.11'
package_version: '2.20.12'

data_types:

Expand Down
2 changes: 1 addition & 1 deletion plugin_1_4.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins:
vsphere:
executor: central_deployment_agent
package_name: cloudify-vsphere-plugin
package_version: '2.20.11'
package_version: '2.20.12'

data_types:

Expand Down
2 changes: 1 addition & 1 deletion plugin_1_5.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins:
vsphere:
executor: central_deployment_agent
package_name: cloudify-vsphere-plugin
package_version: '2.20.11'
package_version: '2.20.12'
properties_description: |
Manage vSphere resources.
properties:
Expand Down
71 changes: 0 additions & 71 deletions python311.patch
View file

This file was deleted.

6 changes: 6 additions & 0 deletions requirements-3.6.in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
netaddr==0.7.19
pyvmomi==6.7.3
pyyaml>=6.0
rsa==4.5
cryptography==40.0.2
smmap<3.0.5,>=3.0.1
244 changes: 244 additions & 0 deletions requirements-3.6.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,244 @@
#
# This file is autogenerated by pip-compile with python 3.6
# To update, run:
#
# pip-compile --no-emit-index-url --output-file=requirements-3.6.txt requirements-3.6.in setup.py
#
adal==1.2.7
# via msrestazure
aiohttp==3.7.4.post0
# via cloudify-common
async-timeout==3.0.1
# via aiohttp
attrs==22.2.0
# via aiohttp
azure-common==1.1.28
# via azure-mgmt-containerservice
azure-core==1.24.2
# via
# azure-identity
# azure-mgmt-core
# msrest
azure-identity==1.10.0
# via cloudify-utilities-plugins-sdk
azure-mgmt-containerservice==17.0.0
# via cloudify-utilities-plugins-sdk
azure-mgmt-core==1.3.2
# via azure-mgmt-containerservice
bcrypt==4.0.1
# via paramiko
boto3==1.23.10
# via cloudify-utilities-plugins-sdk
botocore==1.26.10
# via
# boto3
# s3transfer
bottle==0.12.19
# via cloudify-common
cachetools==4.2.4
# via google-auth
certifi==2023.11.17
# via
# kubernetes
# msrest
# requests
cffi==1.15.1
# via
# cryptography
# pynacl
chardet==4.0.0
# via aiohttp
charset-normalizer==2.0.12
# via requests
cloudify-common==6.4.2.0
# via
# cloudify-utilities-plugins-sdk
# cloudify-vsphere-plugin (setup.py)
cloudify-utilities-plugins-sdk==0.0.130
# via cloudify-vsphere-plugin (setup.py)
cryptography==40.0.2
# via
# -r requirements-3.6.in
# adal
# azure-identity
# msal
# paramiko
# pyjwt
deepdiff==3.3.0
# via cloudify-vsphere-plugin (setup.py)
fasteners==0.17.3
# via cloudify-common
gitdb==4.0.8
# via
# cloudify-utilities-plugins-sdk
# gitpython
gitpython==3.1.18
# via cloudify-utilities-plugins-sdk
google-auth==2.15.0
# via
# cloudify-utilities-plugins-sdk
# kubernetes
idna==3.6
# via
# idna-ssl
# requests
# yarl
idna-ssl==1.1.0
# via aiohttp
importlib-metadata==4.8.3
# via jsonpickle
isodate==0.6.1
# via msrest
jinja2==2.11.3
# via
# cloudify-common
# cloudify-utilities-plugins-sdk
jmespath==0.10.0
# via
# boto3
# botocore
jsonpickle==2.2.0
# via deepdiff
kubernetes==v26.1.0
# via cloudify-utilities-plugins-sdk
markupsafe==2.0.1
# via jinja2
msal==1.25.0
# via
# azure-identity
# msal-extensions
msal-extensions==1.0.0
# via azure-identity
msrest==0.7.1
# via
# azure-mgmt-containerservice
# msrestazure
msrestazure==0.6.4
# via cloudify-utilities-plugins-sdk
multidict==5.2.0
# via
# aiohttp
# yarl
netaddr==0.7.19
# via
# -r requirements-3.6.in
# cloudify-vsphere-plugin (setup.py)
oauthlib==3.2.2
# via requests-oauthlib
packaging==21.3
# via cloudify-utilities-plugins-sdk
paramiko==3.3.1
# via cloudify-utilities-plugins-sdk
pika==1.1.0
# via cloudify-common
pkginfo==1.9.6
# via wagon
portalocker==2.7.0
# via msal-extensions
proxy_tools==0.1.0
# via cloudify-common
psutil==5.9.6
# via cloudify-utilities-plugins-sdk
pyasn1==0.5.1
# via
# pyasn1-modules
# rsa
pyasn1-modules==0.3.0
# via google-auth
pycdlib==1.14.0
# via cloudify-utilities-plugins-sdk
pycparser==2.21
# via cffi
pyjwt[crypto]==2.4.0
# via
# adal
# msal
pynacl==1.5.0
# via paramiko
pyparsing==3.0.7
# via packaging
python-dateutil==2.8.2
# via
# adal
# botocore
# kubernetes
pytz==2021.3
# via cloudify-common
pyvmomi==6.7.3
# via
# -r requirements-3.6.in
# cloudify-vsphere-plugin (setup.py)
pyyaml==6.0.1
# via
# -r requirements-3.6.in
# cloudify-utilities-plugins-sdk
# kubernetes
requests==2.27.1
# via
# adal
# azure-core
# cloudify-common
# cloudify-utilities-plugins-sdk
# cloudify-vsphere-plugin (setup.py)
# kubernetes
# msal
# msrest
# pyvmomi
# requests-oauthlib
# requests-toolbelt
requests-oauthlib==1.3.1
# via
# kubernetes
# msrest
requests_toolbelt==0.9.1
# via cloudify-common
retrying==1.3.3
# via cloudify-common
rsa==4.5
# via
# -r requirements-3.6.in
# google-auth
s3transfer==0.5.2
# via boto3
six==1.16.0
# via
# azure-core
# azure-identity
# google-auth
# isodate
# kubernetes
# msrestazure
# python-dateutil
# pyvmomi
# retrying
smmap==3.0.4
# via
# -r requirements-3.6.in
# gitdb
typing-extensions==4.1.1
# via
# aiohttp
# azure-core
# gitpython
# importlib-metadata
# yarl
urllib3==1.26.18
# via
# botocore
# kubernetes
# requests
wagon==1.0.1
# via cloudify-common
websocket-client==1.3.1
# via kubernetes
wheel==0.37.1
# via wagon
xmltodict==0.13.0
# via cloudify-utilities-plugins-sdk
yarl==1.7.2
# via aiohttp
zipp==3.6.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# setuptools
Loading

0 comments on commit b3fbb3a

Please sign in to comment.