Merge pull request #121 from cloudify-cosmo/2.0.24-build

update requirements.txt

.gitignore

@@ -100,3 +100,6 @@ local-storage/
 plugin_docs
 workspace
 *.wgn
+fusion-agent
+fusion-common
+fusion-manager

CHANGELOG.txt

@@ -1,3 +1,4 @@
+2.0.24: Rerelease with requirements change.
 2.0.23: adjust python 3.11 patch.
 2.0.22: Add DSL 1.5 plugin YAML.
 2.0.21: fix tasks to be compatible with py311.

extra-packaging-instructions.sh

@@ -10,6 +10,4 @@ EOF
     touch ./webbrowser/__init__.py
     cat <<EOF > ./webbrowser/__init__.py
 EOF
-    git apply python311.patch
-    echo patch applied
 fi

fabric_plugin/__version__.py

@@ -1 +1 @@
-version = '2.0.23'
+version = '2.0.24'

plugin.yaml

@@ -5,4 +5,4 @@ plugins:
     fabric:
         executor: central_deployment_agent
         package_name: cloudify-fabric-plugin
-        package_version: '2.0.23'
+        package_version: '2.0.24'

plugin_1_4.yaml

@@ -5,7 +5,7 @@ plugins:
     fabric:
         executor: central_deployment_agent
         package_name: cloudify-fabric-plugin
-        package_version: '2.0.23'
+        package_version: '2.0.24'
 
 blueprint_labels:
   obj-type:

plugin_1_5.yaml

@@ -5,7 +5,7 @@ plugins:
     fabric:
         executor: central_deployment_agent
         package_name: cloudify-fabric-plugin
-        package_version: '2.0.23'
+        package_version: '2.0.24'
 
 blueprint_labels:
   obj-type:

requirements-3.6.in

@@ -0,0 +1,3 @@
+cryptography==40.0.2
+networkx>=2.5.1,<2.6
+pyyaml>=6.0

requirements-3.6.txt

@@ -0,0 +1,102 @@
+#
+# 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
+#
+aiohttp==3.8.6
+    # via cloudify-common
+aiosignal==1.2.0
+    # via aiohttp
+async-timeout==4.0.2
+    # via aiohttp
+asynctest==0.13.0
+    # via aiohttp
+attrs==22.2.0
+    # via aiohttp
+bcrypt==4.0.1
+    # via paramiko
+bottle==0.12.25
+    # via cloudify-common
+certifi==2023.11.17
+    # via requests
+cffi==1.15.1
+    # via
+    #   cryptography
+    #   pynacl
+charset-normalizer==2.0.12
+    # via
+    #   aiohttp
+    #   requests
+cloudify-common==7.0.3
+    # via cloudify-fabric-plugin (setup.py)
+cryptography==40.0.2
+    # via
+    #   -r requirements-3.6.in
+    #   paramiko
+decorator==4.4.2
+    # via networkx
+distro==1.8.0
+    # via cloudify-common
+fabric2==2.5.0
+    # via cloudify-fabric-plugin (setup.py)
+fasteners==0.19
+    # via cloudify-common
+frozenlist==1.2.0
+    # via
+    #   aiohttp
+    #   aiosignal
+idna==3.6
+    # via
+    #   idna-ssl
+    #   requests
+    #   yarl
+idna-ssl==1.1.0
+    # via aiohttp
+invoke==1.7.3
+    # via fabric2
+jinja2==3.0.3
+    # via cloudify-common
+markupsafe==2.0.1
+    # via jinja2
+multidict==5.2.0
+    # via
+    #   aiohttp
+    #   yarl
+networkx==2.5.1
+    # via -r requirements-3.6.in
+paramiko==3.3.1
+    # via fabric2
+pika==1.3.1
+    # via cloudify-common
+pkginfo==1.9.6
+    # via wagon
+proxy-tools==0.1.0
+    # via cloudify-common
+pycparser==2.21
+    # via cffi
+pynacl==1.5.0
+    # via paramiko
+pytz==2023.3.post1
+    # via cloudify-common
+pyyaml==6.0.1
+    # via -r requirements-3.6.in
+requests==2.27.1
+    # via
+    #   cloudify-common
+    #   requests-toolbelt
+requests-toolbelt==1.0.0
+    # via cloudify-common
+typing-extensions==4.1.1
+    # via
+    #   aiohttp
+    #   async-timeout
+    #   yarl
+urllib3==1.26.18
+    # via requests
+wagon==1.0.1
+    # via cloudify-common
+wheel==0.37.1
+    # via wagon
+yarl==1.7.2
+    # via aiohttp

requirements.in

@@ -0,0 +1,5 @@
+-e fusion-common
+-e fusion-manager/mgmtworker
+-e fusion-agent
+cryptography>=41.0.5
+networkx>=2.5.1,<2.6

requirements.txt

@@ -0,0 +1,128 @@
+#
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
+#
+#    pip-compile --no-emit-index-url --output-file=requirements.txt requirements.in setup.py
+#
+-e fusion-agent
+    # via
+    #   -r requirements.in
+    #   fusion-mgmtworker
+-e fusion-common
+    # via
+    #   -r requirements.in
+    #   cloudify-fabric-plugin (setup.py)
+    #   fusion-agent
+    #   fusion-mgmtworker
+-e fusion-manager/mgmtworker
+    # via -r requirements.in
+aiohttp==3.9.1
+    # via fusion-common
+aiosignal==1.3.1
+    # via aiohttp
+appdirs==1.4.3
+    # via fusion-agent
+attrs==23.1.0
+    # via aiohttp
+bcrypt==4.1.1
+    # via paramiko
+bottle==0.12.25
+    # via fusion-common
+certifi==2023.11.17
+    # via
+    #   fusion-mgmtworker
+    #   requests
+cffi==1.16.0
+    # via
+    #   cryptography
+    #   pynacl
+charset-normalizer==3.3.2
+    # via requests
+click==8.1.7
+    # via fusion-agent
+cryptography==41.0.7
+    # via
+    #   -r requirements.in
+    #   fusion-mgmtworker
+    #   paramiko
+decorator==4.4.2
+    # via networkx
+distro==1.8.0
+    # via fusion-common
+fabric2==2.5.0
+    # via cloudify-fabric-plugin (setup.py)
+fasteners==0.19
+    # via fusion-common
+frozenlist==1.4.0
+    # via
+    #   aiohttp
+    #   aiosignal
+idna==3.6
+    # via
+    #   requests
+    #   yarl
+invoke==1.7.3
+    # via fabric2
+jinja2==3.1.2
+    # via
+    #   fusion-agent
+    #   fusion-common
+markupsafe==2.1.3
+    # via jinja2
+multidict==6.0.4
+    # via
+    #   aiohttp
+    #   yarl
+networkx==2.5.1
+    # via
+    #   -r requirements.in
+    #   fusion-common
+packaging==21.3
+    # via
+    #   fusion-agent
+    #   fusion-mgmtworker
+paramiko==3.3.1
+    # via fabric2
+pika==1.3.2
+    # via fusion-common
+pkginfo==1.9.6
+    # via wagon
+proxy-tools==0.1.0
+    # via fusion-common
+psycopg2==2.9.9
+    # via fusion-mgmtworker
+pycparser==2.21
+    # via cffi
+pynacl==1.5.0
+    # via paramiko
+pyparsing==3.1.1
+    # via packaging
+python-dateutil==2.8.2
+    # via fusion-mgmtworker
+pytz==2023.3.post1
+    # via
+    #   fusion-common
+    #   fusion-mgmtworker
+pyyaml==6.0
+    # via fusion-common
+requests==2.31.0
+    # via
+    #   fusion-agent
+    #   fusion-common
+    #   requests-toolbelt
+requests-toolbelt==1.0.0
+    # via fusion-common
+retrying==1.3.4
+    # via fusion-mgmtworker
+six==1.16.0
+    # via
+    #   python-dateutil
+    #   retrying
+urllib3==2.1.0
+    # via requests
+wagon==1.0.1
+    # via fusion-common
+wheel==0.42.0
+    # via wagon
+yarl==1.9.3
+    # via aiohttp

setup.py

@@ -14,8 +14,9 @@
 
 import os
 import re
+import sys
 import pathlib
-from setuptools import setup
+from setuptools import setup, find_packages
 
 
 def get_version():
@@ -26,16 +27,28 @@ def get_version():
         return re.search(r'\d+.\d+.\d+', var).group()
 
 
+install_requires = [
+    'fabric2==2.5.0'
+]
+
+if sys.version_info.major == 3 and sys.version_info.minor == 6:
+    packages = ['fabric_plugin']
+    install_requires += [
+        'cloudify-common>=4.5.5',
+    ]
+else:
+    packages = find_packages()
+    install_requires += [
+        'fusion-common',
+    ]
+
 setup(
     name='cloudify-fabric-plugin',
     version=get_version(),
     author='Cloudify',
     author_email='[email protected]',
-    packages=['fabric_plugin'],
+    packages=packages,
     license='LICENSE',
     description='Plugin for remotely running fabric tasks and commands',
-    install_requires=[
-        'cloudify-common>=4.5.5',
-        'fabric2==2.5.0',
-    ]
+    install_requires=install_requires
 )

test-requirements.txt

@@ -1,4 +1,3 @@
-git+https://github.com/cloudify-cosmo/cloudify-common@master#egg=cloudify-common[dispatcher]==master
 mock
 pytest
 pytest-cov

tox.ini

@@ -10,7 +10,7 @@ setenv =
 
 usedevelop = True
 install_command = pip install -U {opts} {packages}
-deps = -r{toxinidir}/dev-requirements.txt
+deps = -r{toxinidir}/requirements-3.6.txt
        -r{toxinidir}/test-requirements.txt
 whitelist_externals = bash