Skip to content

Commit c0d6f8e

Browse files
committed
Merge branch 'integrity/runtime/deptree' into unstable/v1
PR #420
2 parents dc37677 + 9090099 commit c0d6f8e

8 files changed

Lines changed: 1047 additions & 54 deletions

File tree

‎.github/workflows/reusable-smoke-test.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,16 @@ jobs:
9191
with:
9292
path: test
9393
persist-credentials: false
94+
- name: Configure Python with pip supporting hashes in constraints
95+
uses: actions/setup-python@v7
96+
with:
97+
python-version: 3.13 # same as container + pip-tools + hash support
9498
- name: Install the packaging-related tools
95-
run: python3 -m pip install build twine
96-
env:
97-
PIP_CONSTRAINT: test/requirements/runtime.txt
99+
run: >-
100+
python3 -Im pip install
101+
--constraint=test/requirements/test-smoke-prerequisites.txt
102+
--only-binary=:all:
103+
--requirement=test/requirements/test-smoke-prerequisites.in
98104
- name: Create the stub package importable directory
99105
run: mkdir -pv src/test_package
100106
- name: Populate the stub package `__init__.py`

‎.pip-tools.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[tool.pip-tools]
22
allow-unsafe = true
3+
generate-hashes = true
34
resolver = "backtracking"
45
strip-extras = true

‎Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ ENV PIP_ROOT_USER_ACTION ignore
1414
ENV PATH "/root/.local/bin:${PATH}"
1515
ENV PYTHONPATH "/root/.local/lib/python3.13/site-packages"
1616

17+
COPY .pip-tools.toml .
1718
COPY requirements requirements
1819
RUN \
1920
PIP_CONSTRAINT=requirements/runtime-prerequisites.txt \
Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,9 @@
1-
pip
1+
# NOTE: pip v26.1 fixed a bug in the resolvelib depresolver implementation
2+
# that prevented us from using `--require-hashes` in constraint files since
3+
# roughly year 2020. But now we can get back to using it.
4+
#
5+
# Refs:
6+
# * https://pip.pypa.io/en/stable/news/#v26-1
7+
# * https://github.com/pypa/pip/issues/9243
8+
# * https://github.com/pypa/pip/pull/13887
9+
pip >= 26.1

‎requirements/runtime-prerequisites.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
# This file is autogenerated by pip-compile with Python 3.13
33
# by the following command:
44
#
5-
# pip-compile --allow-unsafe --config=../.pip-tools.toml --output-file=runtime-prerequisites.txt --strip-extras runtime-prerequisites.in
5+
# pip-compile --allow-unsafe --config=../.pip-tools.toml --generate-hashes --output-file=runtime-prerequisites.txt --strip-extras runtime-prerequisites.in
66
#
77

88
# The following packages are considered to be unsafe in a requirements file:
9-
pip==25.2
9+
pip==26.2 \
10+
--hash=sha256:2d8542afcc84cdd8e846c2b36b2861fad1da376dd98f8e7113e9108a3c331690 \
11+
--hash=sha256:931c303696af6fa3417112103b1cad26890e5a07eccb5b99783700e33f2b8aad
1012
# via -r runtime-prerequisites.in

‎requirements/runtime.txt‎

Lines changed: 527 additions & 48 deletions
Large diffs are not rendered by default.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
-c runtime.in # to somewhat match runtime
2+
3+
build # for building the stub dist
4+
twine # for uploading the stub dist

‎requirements/test-smoke-prerequisites.txt‎

Lines changed: 492 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)