Skip to content

Commit

Permalink
Merge pull request #619 from cmatsuoka/pin-cryptography
Browse files Browse the repository at this point in the history
setup, packaging: pin cryptography package and update dependencies
  • Loading branch information
facundobatista authored Jan 10, 2022
2 parents 9b0cf5f + 19b000d commit f88226e
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 33 deletions.
40 changes: 21 additions & 19 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,32 +1,33 @@
attrs==21.2.0
black==21.11b1
attrs==21.4.0
black==21.12b0
certifi==2021.10.8
cffi==1.15.0
charset-normalizer==2.0.7
charset-normalizer==2.0.10
click==8.0.3
coverage==6.1.2
craft-parts==1.1.0
coverage==6.2
craft-parts==1.1.1
craft-providers==1.0.3
craft-store==1.2.0
cryptography==35.0.0
cryptography==3.4
flake8==4.0.1
humanize==3.12.0
humanize==3.13.1
idna==3.3
importlib-metadata==4.8.2
importlib-metadata==4.10.0
importlib-resources==5.4.0
iniconfig==1.1.1
jeepney==0.7.1
Jinja2==3.0.3
jsonschema==4.2.1
keyring==23.2.1
jsonschema==4.3.3
keyring==23.5.0
macaroonbakery==1.3.1
MarkupSafe==2.0.1
mccabe==0.6.1
mypy-extensions==0.4.3
ops==1.2.0
ops==1.3.0
overrides==6.1.0
packaging==21.3
pathspec==0.9.0
platformdirs==2.4.0
platformdirs==2.4.1
pluggy==1.0.0
protobuf==3.19.1
py==1.11.0
Expand All @@ -46,21 +47,22 @@ python-dateutil==2.8.2
pytz==2021.3
pyxdg==0.27
PyYAML==6.0
regex==2021.11.10
requests==2.26.0
requests==2.27.1
requests-toolbelt==0.9.1
requests-unixsocket==0.2.0
requests-unixsocket==0.3.0
responses==0.16.0
SecretStorage==3.3.1
semantic-version==2.8.5
semver==2.13.0
setuptools-rust==1.1.2
six==1.16.0
snap-helpers==0.2.0
snowballstemmer==2.2.0
tabulate==0.8.9
toml==0.10.2
tomli==1.2.2
typing-extensions==4.0.0
tomli==1.2.3
typing-extensions==4.0.1
typing-utils==0.1.0
urllib3==1.26.7
zipp==3.6.0
urllib3==1.26.8
zipp==3.7.0
git+git://github.com/canonical/craft-cli.git@4af19f9c0da733321dc754be1180aea28f3feeb1
29 changes: 16 additions & 13 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
attrs==21.2.0
attrs==21.4.0
certifi==2021.10.8
cffi==1.15.0
charset-normalizer==2.0.7
craft-parts==1.1.0
charset-normalizer==2.0.10
craft-parts==1.1.1
craft-providers==1.0.3
craft-store==1.2.0
cryptography==35.0.0
humanize==3.12.0
cryptography==3.4
humanize==3.13.1
idna==3.3
importlib-metadata==4.8.2
importlib-metadata==4.10.0
importlib-resources==5.4.0
jeepney==0.7.1
Jinja2==3.0.3
jsonschema==4.2.1
keyring==23.2.1
jsonschema==4.3.3
keyring==23.5.0
macaroonbakery==1.3.1
MarkupSafe==2.0.1
overrides==6.1.0
Expand All @@ -30,16 +31,18 @@ python-dateutil==2.8.2
pytz==2021.3
pyxdg==0.27
PyYAML==6.0
requests==2.26.0
requests==2.27.1
requests-toolbelt==0.9.1
requests-unixsocket==0.2.0
requests-unixsocket==0.3.0
SecretStorage==3.3.1
semantic-version==2.8.5
semver==2.13.0
setuptools-rust==1.1.2
six==1.16.0
snap-helpers==0.2.0
tabulate==0.8.9
typing-extensions==4.0.0
typing-extensions==4.0.1
typing-utils==0.1.0
urllib3==1.26.7
zipp==3.6.0
urllib3==1.26.8
zipp==3.7.0
git+git://github.com/canonical/craft-cli.git@4af19f9c0da733321dc754be1180aea28f3feeb1
9 changes: 8 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,11 @@
"craft-parts",
"craft-providers",
"craft-store",
"cryptography==3.4", # *1
"humanize>=2.6.0",
"jsonschema",
"jinja2",
"pydantic",
"pydantic==1.8.2", # *2
"python-dateutil",
"pyyaml",
"requests",
Expand All @@ -44,6 +45,12 @@
"snap-helpers",
"tabulate",
]
# *1: cryptography is not needed as a direct dependency, but it will be brought in
# newer versions from other dependencies, and the new ones need a Rust compiler
# which is not present in armhf, ppc64el and s390x architectures.
#
# *2: pydantic 1.8.2 is currently required by craft-parts. We can unpin it after
# we update craft-parts to work correctly with pydantic 1.9.0.

dev_requires = [
"black",
Expand Down
2 changes: 2 additions & 0 deletions snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ parts:
build-packages:
- libffi-dev
- libapt-pkg-dev
- libssl-dev
stage-packages:
- git
- apt
Expand All @@ -108,6 +109,7 @@ parts:
build-environment:
- LDFLAGS: -L/usr/lib/python3.8
- CPPFLAGS: -I/usr/include/python3.8
- CRYPTOGRAPHY_DONT_BUILD_RUST: "1" # for cryptography to not use a Rust compiler (fails on some archs)
override-pull: |
# do the usual pull stuff
snapcraftctl pull
Expand Down

0 comments on commit f88226e

Please sign in to comment.