Skip to content

Commit

Permalink
Merge pull request #120 from cloudify-cosmo/2.0.23-build
Browse files Browse the repository at this point in the history
bump-common
  • Loading branch information
EarthmanT authored Nov 8, 2023
2 parents 2a41043 + 11ed559 commit c5ed714
Show file tree
Hide file tree
Showing 8 changed files with 61 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
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.
2.0.20: Added Py311 wagon.
Expand Down
15 changes: 15 additions & 0 deletions extra-packaging-instructions.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
if [[ $PY311 == 1 ]]
then
mkdir -p ./pydoc
touch ./pydoc/__init__.py
cat <<EOF > ./pydoc/__init__.py
def get_doc(*args):
return ''
EOF
mkdir -p ./webbrowser
touch ./webbrowser/__init__.py
cat <<EOF > ./webbrowser/__init__.py
EOF
git apply python311.patch
echo patch applied
fi
2 changes: 1 addition & 1 deletion fabric_plugin/__version__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version = '2.0.22'
version = '2.0.23'
2 changes: 1 addition & 1 deletion plugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ plugins:
fabric:
executor: central_deployment_agent
package_name: cloudify-fabric-plugin
package_version: '2.0.22'
package_version: '2.0.23'
2 changes: 1 addition & 1 deletion plugin_1_4.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins:
fabric:
executor: central_deployment_agent
package_name: cloudify-fabric-plugin
package_version: '2.0.22'
package_version: '2.0.23'

blueprint_labels:
obj-type:
Expand Down
2 changes: 1 addition & 1 deletion plugin_1_5.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins:
fabric:
executor: central_deployment_agent
package_name: cloudify-fabric-plugin
package_version: '2.0.22'
package_version: '2.0.23'

blueprint_labels:
obj-type:
Expand Down
40 changes: 40 additions & 0 deletions python311.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
diff --git a/constraints.txt b/constraints.txt
index 6d405fb..e69de29 100644
--- a/constraints.txt
+++ b/constraints.txt
@@ -1 +0,0 @@
-cryptography==3.2.1
diff --git a/dev-requirements.txt b/dev-requirements.txt
index e69de29..be35a02 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -0,0 +1 @@
+-e fusion-common
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 38c63a7..6669719 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,7 @@
import os
import re
import pathlib
-from setuptools import setup
+from setuptools import setup, find_packages


def get_version():
@@ -31,11 +31,11 @@ setup(
version=get_version(),
author='Cloudify',
author_email='[email protected]',
- packages=['fabric_plugin'],
+ packages=find_packages(),
license='LICENSE',
description='Plugin for remotely running fabric tasks and commands',
install_requires=[
- 'cloudify-common>=4.5.5',
+ 'fusion-common',
'fabric2==2.5.0',
]
)
2 changes: 1 addition & 1 deletion v2_plugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins:
fabric:
executor: central_deployment_agent
package_name: cloudify-fabric-plugin
package_version: '2.0.22'
package_version: '2.0.23'

blueprint_labels:
obj-type:
Expand Down

0 comments on commit c5ed714

Please sign in to comment.