Skip to content

Commit 13cdeea

Browse files
committed
[squash]
1 parent a923685 commit 13cdeea

File tree

5 files changed

+22
-13
lines changed

5 files changed

+22
-13
lines changed

.github/workflows/fork_pr_benchmarks_run.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,13 @@ jobs:
3939
with:
4040
path: ${{ steps.pip-cache.outputs.dir }}
4141
# The cache key depends on requirements.txt
42-
key: ${{ matrix.platform.runner }}-pip-${{ hashFiles('pyproject.toml') }}-${{ hashFiles('requirements/dev_Linux_requirements.txt') }}
42+
key: ${{ matrix.platform.runner }}-pip-${{ hashFiles('pyproject.toml') }}-${{ hashFiles('requirements/dev_Linux_*_requirements.txt') }}
4343
# Build a virtualenv, but only if it doesn't already exist
44-
- name: Populate pip cache
45-
run: pip install -r requirements/dev_${{ RUNNER_OS }}_requirements.txt
44+
- name: Find out Python version
45+
run: echo "PYVERSION=$(python3 tools/py_version.py)" >> $GITHUB_ENV
46+
- name: Install dependencies
47+
run: |
48+
pip install --require-hashes --no-deps -r requirements/dev_Linux_py${{ env.PYVERSION }}_requirements.txt
4649
if: steps.cache.outputs.cache-hit != 'true'
4750
- name: Save cache
4851
id: cache-save

.github/workflows/pytest.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,11 @@ jobs:
4848
path: ${{ steps.pip-cache.outputs.dir }}
4949
key: ${{ matrix.platform.runner }}-pip-${{ hashFiles('pyproject.toml') }}
5050
# Build a virtualenv, but only if it doesn't already exist
51-
- name: Populate pip cache
52-
run: pip install -r requirements/dev_${{ RUNNER_OS }}_requirements.txt
51+
- name: Find out Python version
52+
run: echo "PYVERSION=$(python3 tools/py_version.py)" >> $GITHUB_ENV
53+
- name: Install dependencies
54+
run: |
55+
pip install --require-hashes --no-deps -r requirements/dev_${{ RUNNER_OS }}_py${{ env.PYVERSION }}_requirements.txt
5356
if: steps.cache.outputs.cache-hit != 'true'
5457
- name: Save cache
5558
id: cache-save
@@ -83,11 +86,13 @@ jobs:
8386
with:
8487
path: ${{ steps.pip-cache.outputs.dir }}
8588
# The cache key depends on requirements.txt
86-
key: ${{ runner.os }}-pip-${{ hashFiles('requirements/dev_Linux_requirements.txt') }}
89+
key: ${{ runner.os }}-pip-${{ hashFiles('requirements/dev_Linux_*_requirements.txt') }}
8790
# Build a virtualenv, but only if it doesn't already exist
88-
- name: Populate pip cache
91+
- name: Find out Python version
92+
run: echo "PYVERSION=$(python3 tools/py_version.py)" >> $GITHUB_ENV
93+
- name: Install dependencies
8994
run: |
90-
python -m pip install --require-hashes --no-deps -r requirements/dev_Linux_requirements.txt
95+
pip install --require-hashes --no-deps -r requirements/dev_${{ RUNNER_OS }}_py${{ env.PYVERSION }}_requirements.txt
9196
if: steps.cache.outputs.cache-hit != 'true'
9297
- name: Save cache
9398
id: cache-save

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Development dependencies:
2727
#### Development install
2828

2929
1. Clone the repository: `git clone https://github.com/google/sedpack`
30-
2. Install dependencies: `python3 -m pip install --require-hashes -r requirements/Linux_requirements.txt`
30+
2. Install dependencies: `python3 -m pip install --require-hashes -r requirements/Linux_py3.13_requirements.txt`
3131
3. Install the package in development mode: `python3 -m pip install --editable
3232
.` (short `pip install -e .` or legacy `python setup.py develop`)
3333

tools/pip_compile.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ export MIN_PYTHON_VERSION=$(python tools/get_min_required_version.py)
2525

2626
# PLATFORM as used by GitHub workflows RUNNER_OS:
2727
# https://docs.github.com/en/actions/reference/workflows-and-actions/variables#default-environment-variables
28-
for PY_VERSION in $(seq $((MIN_PYTHON_VERSION)) 14)
28+
# Fails on the first version which is not available.
29+
for PY_VERSION in $(seq $((MIN_PYTHON_VERSION)) 1000)
2930
do
3031
for PLATFORM in Linux Windows macOS
3132
do

website/src/content/docs/start_here/install.mdx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,21 @@ cd sedpack/ # Change directory to the cloned git repository
4444
<TabItem label="Linux">
4545
For the `x86_64` platform.
4646
```bash
47-
python3 -m pip install --require-hashes -r requirements/dev_Linux_requirements.txt
47+
python3 -m pip install --require-hashes -r requirements/dev_Linux_py3.13_requirements.txt
4848
```
4949
</TabItem>
5050

5151
<TabItem label="Windows">
5252
For the `x86_64` platform.
5353
```bash
54-
python3 -m pip install --require-hashes -r requirements/dev_Windows_requirements.txt
54+
python3 -m pip install --require-hashes -r requirements/dev_Windows_py3.13_requirements.txt
5555
```
5656
</TabItem>
5757

5858
<TabItem label="macOS">
5959
For the `aarch64` platform.
6060
```bash
61-
python3 -m pip install --require-hashes -r requirements/dev_macOS_requirements.txt
61+
python3 -m pip install --require-hashes -r requirements/dev_macOS_py3.13_requirements.txt
6262
```
6363
</TabItem>
6464

0 commit comments

Comments
 (0)