Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/2.7.4 #1932

Merged
merged 5 commits into from
Oct 7, 2024
Merged

Release/2.7.4 #1932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
63d37de
fix: determine version better in setup.py
lengau Oct 2, 2024
e6afa1c
build(deps): update internal dependencies
lengau Oct 2, 2024
8a3d10b
style: autoformat
lengau Oct 3, 2024
98805d2
build(deps): stricter craft-providers dep
lengau Oct 4, 2024
4b50d14
fix: test
lengau Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ codespell==2.2.6
colorama==0.4.6
coverage==7.4.1
craft-cli==2.4.0
craft-parts==1.25.2
craft-providers==1.20.3
craft-parts==1.25.3
craft-providers==1.20.4
craft-store==2.5.0
cryptography==43.0.1
Deprecated==1.2.14
Expand Down Expand Up @@ -65,9 +65,9 @@ pytz==2023.3.post1
pyxdg==0.28
PyYAML==6.0.2
referencing==0.30.2
requests==2.31.0
requests==2.32.3
requests-toolbelt==1.0.0
requests-unixsocket==0.3.0
requests-unixsocket2==0.4.2
responses==0.24.1
rpds-py==0.10.6
ruff==0.1.15
Expand All @@ -85,7 +85,7 @@ types-setuptools==69.0.0.20240125
types-tabulate==0.9.0.20240106
types-urllib3==1.26.25.14
typing_extensions==4.8.0
urllib3==1.26.18
urllib3==2.2.3
virtualenv==20.25.0
wrapt==1.15.0
yamllint==1.32.0
Expand Down
10 changes: 5 additions & 5 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ certifi==2023.7.22
cffi==1.16.0
charset-normalizer==3.3.2
craft-cli==2.4.0
craft-parts==1.25.2
craft-providers==1.20.3
craft-parts==1.25.3
craft-providers==1.20.4
craft-store==2.5.0
cryptography==43.0.1
Deprecated==1.2.14
Expand Down Expand Up @@ -36,9 +36,9 @@ pytz==2023.4
pyxdg==0.28
PyYAML==6.0.2
referencing==0.30.2
requests==2.31.0
requests==2.32.3
requests-toolbelt==1.0.0
requests-unixsocket==0.3.0
requests-unixsocket2==0.4.2
rpds-py==0.10.6
SecretStorage==3.3.3
six==1.16.0
Expand All @@ -47,6 +47,6 @@ tabulate==0.9.0
types-Deprecated==1.2.9.20240311
types-PyYAML==6.0.12.20240808
typing_extensions==4.8.0
urllib3==1.26.18
urllib3==2.2.3
wrapt==1.15.0
zipp==3.17.0
13 changes: 8 additions & 5 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ def determine_version():
0ae7c04
This was copied from tools/version.py to fix #1472
"""
import charmcraft

version = charmcraft.__version__

if version != "devel":
return version
desc = (
subprocess.run(
["git", "describe", "--always", "--long"],
Expand Down Expand Up @@ -65,7 +71,7 @@ def determine_version():
install_requires = [
"craft-cli>=2.3.0",
"craft-parts>=1.18",
"craft-providers",
"craft-providers~=1.20.4",
"craft-store>=2.4",
"distro>=1.3.0",
"humanize>=2.6.0",
Expand All @@ -76,12 +82,9 @@ def determine_version():
"pyyaml",
"requests",
"requests-toolbelt",
"requests-unixsocket",
"requests-unixsocket2",
"snap-helpers",
"tabulate",
# Needed until requests-unixsocket supports urllib3 v2
# https://github.com/msabramo/requests-unixsocket/pull/69
"urllib3<2.0",
]

lint_requires = [
Expand Down
2 changes: 1 addition & 1 deletion tests/commands/test_store_registry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,7 @@ def read(self, size):
assert next(streamed) == b"12345"
assert test_content._test_read_chunks == [chunk_size]
assert next(streamed) == b"6789"
assert test_content._test_read_chunks == [chunk_size, chunk_size]
assert test_content._test_read_chunks == [chunk_size, chunk_size, chunk_size]
with pytest.raises(StopIteration):
next(streamed)

Expand Down
Loading