Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit f33356e

Browse files
author
David Robertson
authored
Use caret (semver bounds) for matrix.org packages (#13082)
1 parent 3d94d07 commit f33356e

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

.ci/scripts/test_old_deps.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@ export VIRTUALENV_NO_DOWNLOAD=1
2727

2828
# Patch the project definitions in-place:
2929
# - Replace all lower and tilde bounds with exact bounds
30-
# - Make the pyopenssl 17.0, which is the oldest version that works with
31-
# a `cryptography` compiled against OpenSSL 1.1.
30+
# - Replace all caret bounds---but not the one that defines the supported Python version!
3231
# - Delete all lines referring to psycopg2 --- so no testing of postgres support.
32+
# - Use pyopenssl 17.0, which is the oldest version that works with
33+
# a `cryptography` compiled against OpenSSL 1.1.
3334
# - Omit systemd: we're not logging to journal here.
3435

3536
# TODO: also replace caret bounds, see https://python-poetry.org/docs/dependency-specification/#version-constraints
@@ -40,6 +41,7 @@ export VIRTUALENV_NO_DOWNLOAD=1
4041

4142
sed -i \
4243
-e "s/[~>]=/==/g" \
44+
-e '/^python = "^/!s/\^/==/g' \
4345
-e "/psycopg2/d" \
4446
-e 's/pyOpenSSL = "==16.0.0"/pyOpenSSL = "==17.0.0"/' \
4547
-e '/systemd/d' \

changelog.d/13082.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Pin dependencies maintained by matrix.org to [semantic version](https://semver.org/) bounds.

poetry.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ jsonschema = ">=3.0.0"
110110
frozendict = ">=1,!=2.1.2"
111111
# We require 2.1.0 or higher for type hints. Previous guard was >= 1.1.0
112112
unpaddedbase64 = ">=2.1.0"
113-
canonicaljson = ">=1.4.0"
113+
canonicaljson = "^1.4.0"
114114
# we use the type definitions added in signedjson 1.1.
115-
signedjson = ">=1.1.0"
115+
signedjson = "^1.1.0"
116116
# validating SSL certs for IP addresses requires service_identity 18.1.
117117
service-identity = ">=18.1.0"
118118
# Twisted 18.9 introduces some logger improvements that the structured
@@ -150,7 +150,7 @@ typing-extensions = ">=3.10.0.1"
150150
cryptography = ">=3.4.7"
151151
# ijson 3.1.4 fixes a bug with "." in property names
152152
ijson = ">=3.1.4"
153-
matrix-common = "~=1.2.1"
153+
matrix-common = "^1.2.1"
154154
# We need packaging.requirements.Requirement, added in 16.1.
155155
packaging = ">=16.1"
156156
# At the time of writing, we only use functions from the version `importlib.metadata`

0 commit comments

Comments
 (0)