Skip to content

Commit d29af17

Browse files
committed
ci: rely on setuptools/pip already installed in github environment
1 parent 55f4663 commit d29af17

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,12 @@ jobs:
3434
with:
3535
python-version: "3.9"
3636

37-
- name: "Install dependencies"
37+
- name: Install dependencies
3838
run: |
39-
pip install --upgrade setuptools pip
40-
pip install --upgrade -r dev-requirements.txt
39+
pip install -r dev-requirements.txt
4140
pip freeze
4241
43-
- name: "Build distribution archives"
42+
- name: Build distribution archives
4443
run: |
4544
python setup.py sdist bdist_wheel
4645

.github/workflows/test.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,9 @@ jobs:
6262
path: ~/.cache/pip
6363
key: "${{ github.run_id }}-${{ matrix.python_version }}"
6464

65-
- name: "Install dependencies"
65+
- name: Install dependencies
6666
run: |
67-
pip install --upgrade setuptools pip
68-
pip install --upgrade -r dev-requirements.txt
67+
pip install -r dev-requirements.txt
6968
pip freeze
7069
7170
- run: pre-commit run --all-files
@@ -110,22 +109,27 @@ jobs:
110109
path: ~/.cache/pip
111110
key: "${{ github.run_id }}-${{ matrix.python_version }}"
112111

113-
- name: "Install"
112+
- name: Install dependencies
113+
run: |
114+
pip install -r dev-requirements.txt
115+
pip freeze
116+
117+
- name: Install repo2docker
114118
run: |
115-
pip install --upgrade setuptools pip wheel
116-
pip install --upgrade -r dev-requirements.txt
117119
python setup.py bdist_wheel
118120
pip install dist/*.whl
121+
119122
# add for mercurial tests
120123
pip install mercurial hg-evolve
124+
121125
pip freeze
122126
123-
- name: "Run tests"
127+
- name: Run tests
124128
run: |
125129
cd tests
126130
pytest --verbose --color=yes --durations=10 --cov=repo2docker ./${{ matrix.repo_type }}
127131
128-
- name: "Upload code coverage stats"
132+
- name: Upload code coverage stats
129133
run: |
130134
pip install codecov
131135
pushd tests && codecov && cat

0 commit comments

Comments
 (0)