Skip to content

Commit 741c0a5

Browse files
committed
[Security] Remove pip cooldown (requires pip 26.0+, breaks Python 3.8)
The lockfile with SHA-256 hashes already provides supply-chain protection. The --uploaded-prior-to flag requires pip 26.0+ which is not available on runners, and Python 3.8 cannot use pip 26.0 at all.
1 parent bc8ad5b commit 741c0a5

File tree

6 files changed

+13
-27
lines changed

6 files changed

+13
-27
lines changed

.github/workflows/docs.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,11 @@ jobs:
2727
python-version: "3.11"
2828
cache: "pip"
2929

30-
- name: Set pip cooldown (2 days)
31-
run: echo "PIP_UPLOADED_PRIOR_TO=$(date -u -d '2 days ago' +%Y-%m-%dT%H:%M:%SZ)" >> $GITHUB_ENV
32-
3330
- name: Upgrade Python packaging tools
34-
run: pip install --disable-pip-version-check --uploaded-prior-to "$PIP_UPLOADED_PRIOR_TO" --upgrade pip setuptools wheel
31+
run: pip install --disable-pip-version-check --upgrade pip setuptools wheel
3532

3633
- name: Install tox
37-
run: pip install --uploaded-prior-to "$PIP_UPLOADED_PRIOR_TO" tox
34+
run: pip install tox
3835

3936
- name: set SPHINX_VERSION
4037
run: |

.github/workflows/publish.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ jobs:
2828
python-version: "3.11"
2929
cache: "pip"
3030

31-
- name: Set pip cooldown (2 days)
32-
run: echo "PIP_UPLOADED_PRIOR_TO=$(date -u -d '2 days ago' +%Y-%m-%dT%H:%M:%SZ)" >> $GITHUB_ENV
33-
3431
- name: Releasing tag ${{ github.event.release.tag_name }}
3532
run: |
3633
# Get tag name from event
@@ -41,7 +38,7 @@ jobs:
4138
fi
4239
4340
# Install pypa/build
44-
python -m pip install --uploaded-prior-to "$PIP_UPLOADED_PRIOR_TO" build --user
41+
python -m pip install build --user
4542
4643
# Build a binary wheel and a source tarball
4744
python -m build --sdist --wheel --outdir dist/ .

.github/workflows/reusable-examples.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,12 @@ jobs:
3232
with:
3333
python-version: ${{ inputs.python-version }}
3434
cache: "pip"
35-
- name: Set pip cooldown (2 days)
36-
run: echo "PIP_UPLOADED_PRIOR_TO=$(date -u -d '2 days ago' +%Y-%m-%dT%H:%M:%SZ)" >> $GITHUB_ENV
3735
- name: Upgrade pip
3836
run: |
39-
python -m pip install --uploaded-prior-to "$PIP_UPLOADED_PRIOR_TO" --upgrade pip
40-
pip install --uploaded-prior-to "$PIP_UPLOADED_PRIOR_TO" --upgrade wheel setuptools build
37+
python -m pip install --upgrade pip
38+
pip install --upgrade wheel setuptools build
4139
- name: Install
42-
run: pip install --disable-pip-version-check --uploaded-prior-to "$PIP_UPLOADED_PRIOR_TO" pyflakes
40+
run: pip install --disable-pip-version-check pyflakes
4341
- name: Check examples
4442
run: ${{ inputs.examples-script }}
4543
shell: bash

.github/workflows/reusable-integration-test.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,12 @@ jobs:
108108
with:
109109
python-version: "3.12"
110110
cache: "pip"
111-
- name: Set pip cooldown (2 days)
112-
run: echo "PIP_UPLOADED_PRIOR_TO=$(date -u -d '2 days ago' +%Y-%m-%dT%H:%M:%SZ)" >> $GITHUB_ENV
113111
- name: Upgrade pip
114112
run: |
115-
python -m pip install --uploaded-prior-to "$PIP_UPLOADED_PRIOR_TO" --upgrade pip
116-
pip install --uploaded-prior-to "$PIP_UPLOADED_PRIOR_TO" --upgrade wheel setuptools build
113+
python -m pip install --upgrade pip
114+
pip install --upgrade wheel setuptools build
117115
- name: Install
118-
run: pip install --disable-pip-version-check --uploaded-prior-to "$PIP_UPLOADED_PRIOR_TO" -e .[apm,tests]
116+
run: pip install --disable-pip-version-check -e .[apm,tests]
119117
- name: Test
120118
run: ./run-tests.sh
121119
shell: bash

.github/workflows/reusable-pre-commit.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,8 @@ jobs:
4343
- uses: actions/setup-python@v4
4444
with:
4545
python-version: '3.11'
46-
- name: Set pip cooldown (2 days)
47-
run: echo "PIP_UPLOADED_PRIOR_TO=$(date -u -d '2 days ago' +%Y-%m-%dT%H:%M:%SZ)" >> $GITHUB_ENV
4846
- name: Install pre-commit
49-
run: python -m pip install --uploaded-prior-to "$PIP_UPLOADED_PRIOR_TO" pre-commit
47+
run: python -m pip install pre-commit
5048
- name: set PY
5149
run: echo "PY=$(python -c 'import platform;print(platform.python_version())')" >> $GITHUB_ENV
5250
- uses: actions/cache@v3

.github/workflows/reusable-python-test.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,12 @@ jobs:
4848
with:
4949
python-version: ${{ matrix.python-version }}
5050
cache: "pip"
51-
- name: Set pip cooldown (2 days)
52-
run: echo "PIP_UPLOADED_PRIOR_TO=$(date -u -d '2 days ago' +%Y-%m-%dT%H:%M:%SZ)" >> $GITHUB_ENV
5351
- name: Upgrade pip
5452
run: |
55-
python -m pip install --uploaded-prior-to "$PIP_UPLOADED_PRIOR_TO" --upgrade pip
56-
pip install --uploaded-prior-to "$PIP_UPLOADED_PRIOR_TO" --upgrade wheel setuptools build
53+
python -m pip install --upgrade pip
54+
pip install --upgrade wheel setuptools build
5755
- name: Install
58-
run: pip install --disable-pip-version-check --uploaded-prior-to "$PIP_UPLOADED_PRIOR_TO" -e .[tests]
56+
run: pip install --disable-pip-version-check -e .[tests]
5957
- name: Test
6058
run: ./run-tests.sh
6159
shell: bash

0 commit comments

Comments
 (0)