Skip to content

Commit 4831e3b

Browse files
committed
Avoid using setuptools in corpus test
1 parent 1329e9d commit 4831e3b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

.github/workflows/test_corpus.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ jobs:
4141
strategy:
4242
fail-fast: false
4343
matrix:
44-
python: ["python2.7", "python3.3", "python3.4", "python3.5", "python3.6", "python3.7", "python3.8", "python3.9", "python3.10", "python3.11", "python3.12"]
44+
python: ["2.7", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
4545
ref: ["${{ inputs.ref }}", "${{ inputs.base-ref }}"]
4646
container:
47-
image: danielflook/python-minifier-build:${{ matrix.python }}-2023-09-25
47+
image: danielflook/python-minifier-build:python${{ matrix.python }}-2023-09-25
4848
volumes:
4949
- /corpus:/corpus
5050
- /corpus-results:/corpus-results
@@ -70,18 +70,18 @@ jobs:
7070
cat sha.txt
7171
VERSION=0.0.0
7272
sed -i "s/setup_requires=.*/version='$VERSION',/; s/use_scm_version=.*//" python-minifier/setup.py
73-
(cd python-minifier && ${{matrix.python}} setup.py install)
73+
(cd python-minifier && pip${{ matrix.python }} install .)
7474
7575
- name: Run tests
7676
run: |
77-
if [[ "${{ matrix.python }}" == "python3.3" || "${{ matrix.python }}" == "python3.4" || "${{ matrix.python }}" == "python3.5" ]]; then
77+
if [[ "${{ matrix.python }}" == "3.3" || "${{ matrix.python }}" == "3.4" || "${{ matrix.python }}" == "3.5" ]]; then
7878
# These versions randomise the hash seed, but don't preserve dict order
7979
# This affects how names are assigned. Disable the hash randomisation for
8080
# deterministic results.
8181
export PYTHONHASHSEED=0
8282
fi
8383
84-
${{matrix.python}} workflow/corpus_test/generate_results.py /corpus /corpus-results $(<sha.txt) ${{ inputs.regenerate-results }}
84+
python${{matrix.python}} workflow/corpus_test/generate_results.py /corpus /corpus-results $(<sha.txt) ${{ inputs.regenerate-results }}
8585
8686
generate_report:
8787
name: Generate Report
@@ -125,4 +125,4 @@ jobs:
125125
126126
- name: Generate Report
127127
run: |
128-
python3.11 workflow/corpus_test/generate_report.py /corpus-results ${{ inputs.ref }} $(<sha.txt) ${{ inputs.base-ref }} $(<base-sha.txt) >> $GITHUB_STEP_SUMMARY
128+
python3.12 workflow/corpus_test/generate_report.py /corpus-results ${{ inputs.ref }} $(<sha.txt) ${{ inputs.base-ref }} $(<base-sha.txt) >> $GITHUB_STEP_SUMMARY

0 commit comments

Comments
 (0)