Skip to content

Commit d1fe513

Browse files
committed
Pin the oscrypto with the merged but unreleased hotfix for CI Ubuntu 24.04
Signed-off-by: Sergey Vasilyev <[email protected]>
1 parent df0d29e commit d1fe513

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

requirements.txt

+10
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,16 @@ codecov
99
coverage
1010
coveralls
1111
freezegun
12+
13+
# Enforce the hotfix for Ubuntu 24.04 in CI. Otherwise, we are stuck in Ubuntu 22.04.
14+
# The bugfix is merged but not released: https://github.com/wbond/oscrypto/issues/78
15+
# Pinning this in the end operators is the decision of the operator developers,
16+
# including the protocols of accessing the repo or vendoring the dependency code.
17+
# The dev-mode dependency is used ONLY with an temporary & insecure self-signed CA for simplicity,
18+
# and ONLY with Ubuntu 24.04+. Therefore, it is not pinned in setup.py (e.g., works fine in 22.04).
19+
# In the worst case, configure the operator with a self-signed CA made in the OpenSSL CLI manually.
20+
git+https://github.com/wbond/oscrypto.git@1547f535001ba568b239b8797465536759c742a3
21+
1222
import-linter
1323
isort
1424
lxml

setup.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,11 @@
7777
'uvloop>=0.18.0; python_version>="3.12"',
7878
],
7979
'dev': [
80-
'pyngrok', # 1.00 MB + downloaded binary
80+
# NB: oscrypto is pinned for Ubuntu 24.04+ in requirements.txt - read the details there.
8181
'oscrypto', # 2.80 MB (smaller than cryptography: 8.7 MB)
8282
'certbuilder', # +0.1 MB (2.90 MB if alone)
8383
'certvalidator', # +0.1 MB (2.90 MB if alone)
84+
'pyngrok', # 1.00 MB + downloaded binary
8485
],
8586
},
8687
package_data={"kopf": ["py.typed"]},

0 commit comments

Comments
 (0)