Skip to content

Commit

Permalink
adjust-py311-patch (#263)
Browse files Browse the repository at this point in the history
* adjust-py311-patch

* removing old python311.patch

* add new python311.patch

---------

Co-authored-by: EarthmanT <[email protected]>
  • Loading branch information
ahmadiesa-abu and EarthmanT authored Nov 8, 2023
1 parent 49b40ee commit eb0300e
Show file tree
Hide file tree
Showing 7 changed files with 70 additions and 9 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
2.20.11:
- adjust python 3.11 patch.
2.20.10:
- fix typo in argument name for load_verify_locations.
2.20.9:
Expand Down
2 changes: 1 addition & 1 deletion cloudify_vsphere/__version__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version = '2.20.10'
version = '2.20.11'
2 changes: 1 addition & 1 deletion plugin.yaml
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.10'
package_version: '2.20.11'

data_types:

Expand Down
2 changes: 1 addition & 1 deletion plugin_1_4.yaml
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.10'
package_version: '2.20.11'

data_types:

Expand Down
2 changes: 1 addition & 1 deletion plugin_1_5.yaml
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.10'
package_version: '2.20.11'
properties_description: |
Manage vSphere resources.
properties:
Expand Down
67 changes: 63 additions & 4 deletions python311.patch
Original file line number Diff line number Diff line change
@@ -1,12 +1,71 @@
diff --git a/constraints.txt b/constraints.txt
index a07439a..ed5e78b 100644
--- a/constraints.txt
+++ b/constraints.txt
@@ -1,8 +1,6 @@
-netaddr==0.7.19
pyvmomi==6.7.3
pyyaml>=6.0
rsa==4.5
-cryptography==3.2.1
+cryptography>=41.0.4
decorator>=4.4.2
-urllib3===1.24.3
smmap<3.0.5,>=3.0.1
\ No newline at end of file
diff --git a/dev-requirements.txt b/dev-requirements.txt
index e69de29..9bf8b21 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -0,0 +1,2 @@
+-e fusion-common
+-e cloudify-utilities-plugins-sdk
diff --git a/setup.py b/setup.py
index 8deafd4..34ce67c 100755
index 8deafd4..25a7527 100755
--- a/setup.py
+++ b/setup.py
@@ -56,6 +56,6 @@ setup(
@@ -15,7 +15,7 @@
import os
import re
import pathlib
-from setuptools import setup
+from setuptools import setup, find_packages


def get_version():
@@ -31,31 +31,15 @@ setup(
zip_safe=True,
name='cloudify-vsphere-plugin',
version=get_version(),
- packages=[
- 'vsphere_plugin_common',
- 'vsphere_plugin_common.clients',
- 'vsphere_server_plugin',
- 'vsphere_network_plugin',
- 'vsphere_storage_plugin',
- 'cloudify_vsphere',
- 'cloudify_vsphere.cluster',
- 'cloudify_vsphere.contentlibrary',
- 'cloudify_vsphere.datacenter',
- 'cloudify_vsphere.datastore',
- 'cloudify_vsphere.devices',
- 'cloudify_vsphere.hypervisor_host',
- 'cloudify_vsphere.resource_pool',
- 'cloudify_vsphere.vm_folder',
- 'cloudify_vsphere.ovf',
- ],
+ packages=find_packages(),
license='LICENSE',
description='Cloudify plugin for vSphere infrastructure.',
install_requires=[
- "cloudify-common>=4.5",
+ "fusion-common",
"pyvmomi>=6.7.3,<8.0.0",
"netaddr>=0.7.19",
"cloudify-utilities-plugins-sdk>=0.0.61",
- "cloudify-utilities-plugins-sdk>=0.0.61",
+ "cloudify-utilities-plugins-sdk>=0.0.129",
"requests",
- 'deepdiff==3.3.0'
+ 'deepdiff>=5.7.0'
+ 'deepdiff==5.7.0'
]
)
2 changes: 1 addition & 1 deletion v2_plugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plugins:
vsphere:
executor: central_deployment_agent
package_name: cloudify-vsphere-plugin
package_version: '2.20.10'
package_version: '2.20.11'

data_types:

Expand Down

0 comments on commit eb0300e

Please sign in to comment.