Rename matrix variable python_version to python-version

molinav · molinav · commit 4b1070cce63a · 2021-12-07T11:12:33.000+01:00
diff --git a/.github/workflows/basemap-data-hires.yml b/.github/workflows/basemap-data-hires.yml
@@ -13,12 +13,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python_version:
+        python-version:
           [
             "2.7",
           ]
       max-parallel: 1
-    container: "pylegacy/python:${{ matrix.python_version }}-debian-4"
+    container: "pylegacy/python:${{ matrix.python-version }}-debian-4"
     steps:
       -
         name: Checkout
@@ -48,7 +48,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python_version:
+        python-version:
           [
             "2.6",
             "2.7",
@@ -62,7 +62,7 @@ jobs:
             "3.9",
           ]
       max-parallel: 5
-    container: "pylegacy/python:${{ matrix.python_version }}-debian-5"
+    container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
     steps:
       -
         name: Checkout
@@ -98,12 +98,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python_version:
+        python-version:
           [
             "2.7",
           ]
       max-parallel: 1
-    container: "pylegacy/python:${{ matrix.python_version }}-debian-5"
+    container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
     environment: PyPI
     steps:
       -
diff --git a/.github/workflows/basemap-data.yml b/.github/workflows/basemap-data.yml
@@ -13,12 +13,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python_version:
+        python-version:
           [
             "2.7",
           ]
       max-parallel: 1
-    container: "pylegacy/python:${{ matrix.python_version }}-debian-4"
+    container: "pylegacy/python:${{ matrix.python-version }}-debian-4"
     steps:
       -
         name: Checkout
@@ -48,7 +48,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python_version:
+        python-version:
           [
             "2.6",
             "2.7",
@@ -62,7 +62,7 @@ jobs:
             "3.9",
           ]
       max-parallel: 5
-    container: "pylegacy/python:${{ matrix.python_version }}-debian-5"
+    container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
     steps:
       -
         name: Checkout
@@ -98,12 +98,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python_version:
+        python-version:
           [
             "2.7",
           ]
       max-parallel: 1
-    container: "pylegacy/python:${{ matrix.python_version }}-debian-5"
+    container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
     environment: PyPI
     steps:
       -
diff --git a/.github/workflows/basemap.yml b/.github/workflows/basemap.yml
@@ -17,7 +17,7 @@ jobs:
             "i386",
             "amd64",
           ]
-      max-parallel: 6
+      max-parallel: 2
       fail-fast: false
     runs-on: ubuntu-latest
     container: "tinybases/${{matrix.arch}}-python:3.6-debian-4"
@@ -75,7 +75,7 @@ jobs:
             "i386",
             "amd64",
           ]
-        python_version:
+        python-version:
           [
             "2.7",
             "3.5",
@@ -88,7 +88,7 @@ jobs:
       fail-fast: false
     needs: build-geos
     runs-on: ubuntu-latest
-    container: "tinybases/${{matrix.arch}}-python:${{matrix.python_version}}-debian-4"
+    container: "tinybases/${{matrix.arch}}-python:${{matrix.python-version}}-debian-4"
     steps:
       -
         name: Checkout
@@ -119,7 +119,7 @@ jobs:
         run: |
           set -e
           . /etc/profile
-          case "${{matrix.python_version}}" in
+          case "${{matrix.python-version}}" in
               2.[67]|3.[01234])  pkgvers=1.11.3;;
               *)                 pkgvers=1.16.6;;
           esac
@@ -148,7 +148,7 @@ jobs:
         name: Upload build artifacts
         uses: actions/upload-artifact@v1
         with:
-          name: artifacts-build-${{matrix.arch}}-${{matrix.python_version}}
+          name: artifacts-build-${{matrix.arch}}-${{matrix.python-version}}
           path: ${{env.PKGDIR}}/dist
 
   repair:
@@ -159,7 +159,7 @@ jobs:
             "i386",
             "amd64",
           ]
-        python_version:
+        python-version:
           [
             "2.7",
             "3.5",
@@ -187,7 +187,7 @@ jobs:
         name: Download build artifacts
         uses: actions/download-artifact@v1
         with:
-          name: artifacts-build-${{matrix.arch}}-${{matrix.python_version}}
+          name: artifacts-build-${{matrix.arch}}-${{matrix.python-version}}
           path: ${{env.PKGDIR}}/dist
       -
         name: Install GCC toolchain
@@ -250,7 +250,7 @@ jobs:
         name: Upload artifacts
         uses: actions/upload-artifact@v1
         with:
-          name: artifacts-build-${{matrix.arch}}-${{matrix.python_version}}
+          name: artifacts-build-${{matrix.arch}}-${{matrix.python-version}}
           path: ${{env.PKGDIR}}/dist
 
   upload:
@@ -261,7 +261,7 @@ jobs:
             "i386",
             "amd64",
           ]
-        python_version:
+        python-version:
           [
             "2.7",
             "3.5",
@@ -274,7 +274,7 @@ jobs:
     if: startsWith(github.event.ref, 'refs/tags/v')
     needs: repair
     runs-on: ubuntu-latest
-    container: "tinybases/${{matrix.arch}}-python:${{matrix.python_version}}-debian-5"
+    container: "tinybases/${{matrix.arch}}-python:${{matrix.python-version}}-debian-5"
     environment: PyPI
     steps:
       -
@@ -284,7 +284,7 @@ jobs:
         name: Download build artifacts
         uses: actions/download-artifact@v1
         with:
-          name: artifacts-build-${{matrix.arch}}-${{matrix.python_version}}
+          name: artifacts-build-${{matrix.arch}}-${{matrix.python-version}}
           path: ${{env.PKGDIR}}/dist
       -
         name: Print environment

Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,12 @@ jobs:`
`13`	`13`	`runs-on: ubuntu-latest`
`14`	`14`	`strategy:`
`15`	`15`	`matrix:`
`16`		`- python_version:`
	`16`	`+ python-version:`
`17`	`17`	`[`
`18`	`18`	`"2.7",`
`19`	`19`	`]`
`20`	`20`	`max-parallel: 1`
`21`		`- container: "pylegacy/python:${{ matrix.python_version }}-debian-4"`
	`21`	`+ container: "pylegacy/python:${{ matrix.python-version }}-debian-4"`
`22`	`22`	`steps:`
`23`	`23`	`-`
`24`	`24`	`name: Checkout`
`@@ -48,7 +48,7 @@ jobs:`
`48`	`48`	`runs-on: ubuntu-latest`
`49`	`49`	`strategy:`
`50`	`50`	`matrix:`
`51`		`- python_version:`
	`51`	`+ python-version:`
`52`	`52`	`[`
`53`	`53`	`"2.6",`
`54`	`54`	`"2.7",`
`@@ -62,7 +62,7 @@ jobs:`
`62`	`62`	`"3.9",`
`63`	`63`	`]`
`64`	`64`	`max-parallel: 5`
`65`		`- container: "pylegacy/python:${{ matrix.python_version }}-debian-5"`
	`65`	`+ container: "pylegacy/python:${{ matrix.python-version }}-debian-5"`
`66`	`66`	`steps:`
`67`	`67`	`-`
`68`	`68`	`name: Checkout`
`@@ -98,12 +98,12 @@ jobs:`
`98`	`98`	`runs-on: ubuntu-latest`
`99`	`99`	`strategy:`
`100`	`100`	`matrix:`
`101`		`- python_version:`
	`101`	`+ python-version:`
`102`	`102`	`[`
`103`	`103`	`"2.7",`
`104`	`104`	`]`
`105`	`105`	`max-parallel: 1`
`106`		`- container: "pylegacy/python:${{ matrix.python_version }}-debian-5"`
	`106`	`+ container: "pylegacy/python:${{ matrix.python-version }}-debian-5"`
`107`	`107`	`environment: PyPI`
`108`	`108`	`steps:`
`109`	`109`	`-`