Skip to content

Commit

Permalink
Pin various python libs and fix branch in build.lock
Browse files Browse the repository at this point in the history
The python lib pins are for py35 compatability.  The branch issue is due
to bug juju/charm-tools#604

* Also add cffi pin for py35 for charm-tools build support.

Change-Id: I2ac189816b1e133ff8468d4722ce87da48b85c0b
  • Loading branch information
ajkavanagh committed Oct 16, 2021
1 parent f5ee928 commit 0db3935
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85

# Build requirements
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
charm-tools==2.8.3

simplejson
Expand Down
10 changes: 5 additions & 5 deletions src/build.lock
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
"item": "interface:ceph-client",
"url": "https://opendev.org/openstack/charm-interface-ceph-client.git",
"vcs": null,
"branch": null,
"branch": "3ca251fb01a7cd51d2a0ee2b9b66647c8ffe891f",
"commit": "3ca251fb01a7cd51d2a0ee2b9b66647c8ffe891f"
},
{
Expand Down Expand Up @@ -172,7 +172,7 @@
"type": "python_module",
"package": "botocore",
"vcs": null,
"version": "1.21.58"
"version": "1.19.63"
},
{
"type": "python_module",
Expand All @@ -184,7 +184,7 @@
"type": "python_module",
"package": "s3transfer",
"vcs": null,
"version": "0.5.0"
"version": "0.3.6"
},
{
"type": "python_module",
Expand Down Expand Up @@ -222,7 +222,7 @@
"type": "python_module",
"package": "boto3",
"vcs": null,
"version": "1.18.58"
"version": "1.16.63"
},
{
"type": "python_module",
Expand Down Expand Up @@ -269,4 +269,4 @@
"version": "1.26.7"
}
]
}
}
2 changes: 1 addition & 1 deletion src/wheelhouse.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
boto3
boto3<1.17.0 # pin for py35 compatability

git+https://github.com/openstack/charms.openstack.git@stable/21.10#egg=charms.openstack

Expand Down

0 comments on commit 0db3935

Please sign in to comment.