add new python311.patch (#245)

* add new python311.patch

* remove python311.patch

* bump version

* add python311.patch

Author: EarthmanT

CHANGELOG.txt

@@ -178,4 +178,5 @@
 2.13.24: Support Azure Service Account Authentication.
 2.13.25: add __version__.py file in cloudify_kubernetes folder.
 2.13.26: check plugin and update circleci config.
-2.13.27: Use DSL 1.5.
+2.13.27: Use DSL 1.5.
+2.13.28: Update dependencies.

cloudify_kubernetes/__version__.py

@@ -1 +1 @@
-version = '2.13.27'
+version = '2.13.28'

plugin.yaml

@@ -3,7 +3,7 @@ plugins:
   kubernetes:
     executor: central_deployment_agent
     package_name: cloudify-kubernetes-plugin
-    package_version: '2.13.27'
+    package_version: '2.13.28'
 
 data_types:
 

plugin_1_4.yaml

@@ -3,7 +3,7 @@ plugins:
   kubernetes:
     executor: central_deployment_agent
     package_name: cloudify-kubernetes-plugin
-    package_version: '2.13.27'
+    package_version: '2.13.28'
 
 data_types:
 

plugin_1_5.yaml

@@ -3,7 +3,7 @@ plugins:
   kubernetes:
     executor: central_deployment_agent
     package_name: cloudify-kubernetes-plugin
-    package_version: '2.13.27'
+    package_version: '2.13.28'
 
 data_types:
 

python311.patch

@@ -1,139 +1,67 @@
 diff --git a/constraints.txt b/constraints.txt
-index 863be00..34de6a6 100644
+index 863be00..26c55dc 100644
 --- a/constraints.txt
 +++ b/constraints.txt
-@@ -1,3 +1,4 @@
+@@ -1,3 +1,2 @@
 -cloudify-common>===6.4.2
 -git+https://github.com/cloudify-cosmo/[email protected]#egg=cloudify-types&subdirectory=cloudify_types
 -charset_normalizer===3.0.1
 \ No newline at end of file
-+cloudify-common>===7.0.0
-+# git+https://github.com/cloudify-cosmo/[email protected]#egg=cloudify-types&subdirectory=cloudify_types
-+git+https://github.com/cloudify-cosmo/[email protected]#egg=cloudify-mgmtworker&subdirectory=mgmtworker
-+git+https://github.com/cloudify-cosmo/[email protected]#egg=cloudify-agent
++cryptography>=41.0.4
++charset_normalizer===3.0.1
 diff --git a/dev-requirements.txt b/dev-requirements.txt
-index 19732bb..cfe88eb 100644
+index 19732bb..1ce86c2 100644
 --- a/dev-requirements.txt
 +++ b/dev-requirements.txt
 @@ -1 +1,4 @@
 -git+https://github.com/cloudify-cosmo/[email protected]#egg=cloudify-types&subdirectory=cloudify_types
-+# cloudify-common>===7.0.0
-+# git+https://github.com/cloudify-cosmo/[email protected]#egg=cloudify-types&subdirectory=cloudify_types
-+git+https://github.com/cloudify-cosmo/[email protected]#egg=cloudify-mgmtworker&subdirectory=mgmtworker
-+git+https://github.com/cloudify-cosmo/[email protected]#egg=cloudify-agent
-# diff --git a/pydoc/__init__.py b/pydoc/__init__.py
-# new file mode 100644
-# index 0000000..3676233
-# --- /dev/null
-# +++ b/pydoc/__init__.py
-# @@ -0,0 +1,3 @@
-# +
-# +def get_doc(*args):
-# +    return ''
-# diff --git a/python311.diff b/python311.diff
-# new file mode 100644
-# index 0000000..f1499f8
-# --- /dev/null
-# +++ b/python311.diff
-# @@ -0,0 +1,65 @@
-+diff --git a/constraints.txt b/constraints.txt
-+index 863be00..34de6a6 100644
-+--- a/constraints.txt
-++++ b/constraints.txt
-+@@ -1,3 +1,4 @@
-+-cloudify-common>===6.4.2
-+-git+https://github.com/cloudify-cosmo/[email protected]#egg=cloudify-types&subdirectory=cloudify_types
-+-charset_normalizer===3.0.1
-+\ No newline at end of file
-++cloudify-common>===7.0.0
-++# git+https://github.com/cloudify-cosmo/[email protected]#egg=cloudify-types&subdirectory=cloudify_types
-++git+https://github.com/cloudify-cosmo/[email protected]#egg=cloudify-mgmtworker&subdirectory=mgmtworker
-++git+https://github.com/cloudify-cosmo/[email protected]#egg=cloudify-agent
-+diff --git a/dev-requirements.txt b/dev-requirements.txt
-+index 19732bb..cfe88eb 100644
-+--- a/dev-requirements.txt
-++++ b/dev-requirements.txt
-+@@ -1 +1,4 @@
-+-git+https://github.com/cloudify-cosmo/[email protected]#egg=cloudify-types&subdirectory=cloudify_types
-++# cloudify-common>===7.0.0
-++# git+https://github.com/cloudify-cosmo/[email protected]#egg=cloudify-types&subdirectory=cloudify_types
-++git+https://github.com/cloudify-cosmo/[email protected]#egg=cloudify-mgmtworker&subdirectory=mgmtworker
-++git+https://github.com/cloudify-cosmo/[email protected]#egg=cloudify-agent
-+diff --git a/examples/blueprint-examples b/examples/blueprint-examples
-+--- a/examples/blueprint-examples
-++++ b/examples/blueprint-examples
-+@@ -1 +1 @@
-+-Subproject commit 706cac79e74217733c4c4cf26032021ba55132f8
-++Subproject commit 706cac79e74217733c4c4cf26032021ba55132f8-dirty
-+diff --git a/setup.py b/setup.py
-+index f4d4d02..47b9aae 100755
-+--- a/setup.py
-++++ b/setup.py
-+@@ -32,8 +32,9 @@ def get_version():
-+ install_requires = [
-+     'cloudify-python-importer==0.2.1',
-+     'cloudify-common>=4.5',
-+-    'cloudify-types>=6.3.1',
-+-    'deepdiff==3.3.0',
-++    # 'cloudify-types>=6.3.1',
-++    'cloudify-mgmtworker',
-++    'deepdiff>=5.7.0',
-+     'cloudify-utilities-plugins-sdk>=0.0.112',  # Provides kubernetes and google-auth.
-+ ]
-+ 
-+@@ -48,7 +49,8 @@ setup(
-+     packages=['cloudify_kubernetes',
-+               'cloudify_kubernetes.k8s',
-+               'cloudify_kubernetes.tasks',
-+-              'cloudify_kubernetes.tasks.nested_resources'],
-++              'cloudify_kubernetes.tasks.nested_resources',
-++              'pydoc'],
-+     license='LICENSE',
-+     install_requires=install_requires
-+ )
-+diff --git a/test-requirements.txt b/test-requirements.txt
-+index 2904754..9a01c7b 100644
-+--- a/test-requirements.txt
-++++ b/test-requirements.txt
-+@@ -4,4 +4,4 @@ mock
-+ nose-testconfig
-+ nose==1.3.7
-+ nose-cov==1.6
-+-deepdiff==3.3.0
-++deepdiff>=5.7.0
++-e fusion-common
++-e fusion-agent
++-e fusion-manager/mgmtworker
++-e cloudify-utilities-plugins-sdk
+diff --git a/examples/blueprint-examples b/examples/blueprint-examples
+--- a/examples/blueprint-examples
++++ b/examples/blueprint-examples
+@@ -1 +1 @@
+-Subproject commit 706cac79e74217733c4c4cf26032021ba55132f8
++Subproject commit 706cac79e74217733c4c4cf26032021ba55132f8-dirty
 diff --git a/setup.py b/setup.py
-index f4d4d02..47b9aae 100755
+index f4d4d02..0e54075 100755
 --- a/setup.py
 +++ b/setup.py
-@@ -32,8 +32,9 @@ def get_version():
+@@ -16,7 +16,7 @@ import os
+ import re
+ import sys
+ import pathlib
+-from setuptools import setup
++from setuptools import setup, find_packages
+ 
+ PY2 = sys.version_info[0] == 2
+ 
+@@ -31,10 +31,10 @@ def get_version():
+ 
  install_requires = [
      'cloudify-python-importer==0.2.1',
-     'cloudify-common>=4.5',
+-    'cloudify-common>=4.5',
 -    'cloudify-types>=6.3.1',
 -    'deepdiff==3.3.0',
-+    # 'cloudify-types>=6.3.1',
-+    'cloudify-mgmtworker',
-+    'deepdiff>=5.7.0',
-     'cloudify-utilities-plugins-sdk>=0.0.112',  # Provides kubernetes and google-auth.
+-    'cloudify-utilities-plugins-sdk>=0.0.112',  # Provides kubernetes and google-auth.
++    'fusion-common',
++    'fusion-mgmtworker',
++    'deepdiff==5.7.0',
++    'cloudify-utilities-plugins-sdk>=0.0.129',  # Provides kubernetes and google-auth.
  ]
 
-@@ -48,7 +49,8 @@ setup(
-     packages=['cloudify_kubernetes',
-               'cloudify_kubernetes.k8s',
-               'cloudify_kubernetes.tasks',
+ 
+@@ -45,10 +45,7 @@ setup(
+     author_email='[email protected]',
+     description='Plugin provides Kubernetes management possibility',
+     include_package_data=True,
+-    packages=['cloudify_kubernetes',
+-              'cloudify_kubernetes.k8s',
+-              'cloudify_kubernetes.tasks',
 -              'cloudify_kubernetes.tasks.nested_resources'],
-+              'cloudify_kubernetes.tasks.nested_resources',
-+              'pydoc', 'webbrowser'],
++    packages=find_packages(),
      license='LICENSE',
      install_requires=install_requires
  )
-diff --git a/test-requirements.txt b/test-requirements.txt
-index 2904754..9a01c7b 100644
---- a/test-requirements.txt
-+++ b/test-requirements.txt
-@@ -4,4 +4,4 @@ mock
- nose-testconfig
- nose==1.3.7
- nose-cov==1.6
--deepdiff==3.3.0
-+deepdiff>=5.7.0

v2_plugin.yaml

@@ -3,7 +3,7 @@ plugins:
   kubernetes:
     executor: central_deployment_agent
     package_name: cloudify-kubernetes-plugin
-    package_version: '2.13.27'
+    package_version: '2.13.28'
 
 data_types: