8000 Fix pipenv jobs (#699) · Ditto190/Github-setup-python@c16c4b8 · GitHub
[go: up one dir, main page]
Skip to content

Commit c16c4b8

Browse files
dmitry-shibanovdmitry-shibanov
authored
Fix pipenv jobs (actions#699)
1 parent 0d5da6a commit c16c4b8

File tree

6 files changed

+75
-48
lines changed

6 files changed

+75
-48
lines changed

‎.github/workflows/e2e-cache.yml

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,22 +43,30 @@ jobs:
4343
steps:
4444
- uses: actions/checkout@v3
4545
- name: Setup Python
46+
id: cache-pipenv
4647
uses: ./
4748
with:
4849
python-version: ${{ matrix.python-version }}
4950
cache: 'pipenv'
5051
- name: Install pipenv
5152
run: curl https://raw.githubusercontent.com/pypa/pipenv/master/get-pipenv.py | python
52-
- name: Install dependencies
53+
- name: Prepare environment
5354
shell: pwsh
5455
run: |
5556
mv ./__tests__/data/Pipfile.lock .
5657
mv ./__tests__/data/Pipfile .
58+
mv ./__tests__/test-pipenv.py .
59+
- name: Install dependencies
60+
shell: pwsh
61+
if: steps.cache-pipenv.outputs.cache-hit != 'true'
62+
run: |
5763
if ("${{ matrix.python-version }}" -Match "pypy") {
58-
pipenv install --keep-outdated --python pypy
64+
pipenv install --python pypy # --keep-outdated
5965
} else {
60-
pipenv install --keep-outdated --python ${{ matrix.python-version }}
66+
pipenv install --python ${{ matrix.python-version }} # --keep-outdated
6167
}
68+
- name: Run Python Script
69+
run: pipenv run python test-pipenv.py
6270

6371
python-poetry-dependencies-caching:
6472
name: Test poetry (Python ${{ matrix.python-version}}, ${{ matrix.os }})
@@ -112,20 +120,28 @@ jobs:
112120
steps:
113121
- uses: actions/checkout@v3
114122
- name: Setup Python
123+
id: cache-pipenv
115124
uses: ./
116125
with:
117126
python-version: ${{ matrix.python-version }}
118127
cache: 'pipenv'
119128
cache-dependency-path: '**/pipenv-requirements.txt'
120129
- name: Install pipenv
121130
run: curl https://raw.githubusercontent.com/pypa/pipenv/master/get-pipenv.py | python
122-
- name: Install dependencies
131+
- name: Prepare environment
123132
shell: pwsh
124133
run: |
125134
mv ./__tests__/data/Pipfile.lock .
126135
mv ./__tests__/data/Pipfile .
136+
mv ./__tests__/test-pipenv.py .
137+
- name: Install dependencies
138+
shell: pwsh
139+
if: steps.cache-pipenv.outputs.cache-hit != 'true'
140+
run: |
127141
if ("${{ matrix.python-version }}" -Match "pypy") {
128-
pipenv install --keep-outdated --python pypy
142+
pipenv install --python pypy # --keep-outdated
129143
} else {
130-
pipenv install --keep-outdated --python ${{ matrix.python-version }}
144+
pipenv install --python ${{ matrix.python-version }} # --keep-outdated
131145
}
146+
- name: Run Python Script
147+
run: pipenv run python test-pipenv.py

‎__tests__/cache-restore.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {State} from '../src/cache-distributions/cache-distributor';
88

99
describe('restore-cache', () => {
1010
const pipFileLockHash =
11-
'a3bdcc71289e4979ca9e051810d81999cc99823109faf6912e17ff14c8e621a6';
11+
'f8428d7cf00ea53a5c3702f0a9cb3cc467f76cd86a34723009350c4e4b32751a';
1212
const requirementsHash =
1313
'd8110e0006d7fb5ee76365d565eef9d37df1d11598b912d3eb66d398d57a1121';
1414
const requirementsLinuxHash =

‎__tests__/data/Pipfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ verify_ssl = true
44
name = "pypi"
55

66
[packages]
7-
flake8 = "==4.0.1"
8-
numpy = "==1.23.0"
7+
flake8 = "==6.0.0"
8+
numpy = "==1.25.1"
99

1010
[dev-packages]
1111

‎__tests__/data/Pipfile.lock

Lines changed: 42 additions & 38 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎__tests__/data/pipenv-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
numpy==1.22.3
2-
pandas==1.4.2
2+
flake8==6.0.0

‎__tests__/test-pipenv.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import numpy as np
2+
3+
a = np.array([2, 3, 4])
4+
print(type(a))
5+
6+
b = np.array([1.2, 3.5, 5.1])
7+
print(type(b))

0 commit comments

Comments
 (0)
0