From d612cf65b8e2ba2dc311e41cf283032abf03cbc7 Mon Sep 17 00:00:00 2001
From: Miranda Mundt <mmundt@sandia.gov>
Date: Tue, 20 Aug 2024 11:41:21 -0600
Subject: [PATCH] Revert env changes; rename pure python area

---
 .github/workflows/release_wheel_creation.yml | 28 +++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/release_wheel_creation.yml b/.github/workflows/release_wheel_creation.yml
index 61441e80dbe..da17978a4a3 100644
--- a/.github/workflows/release_wheel_creation.yml
+++ b/.github/workflows/release_wheel_creation.yml
@@ -14,10 +14,6 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
-env:
-  WITH_CYTHON: "--with-cython --with-distributable-extensions"
-  WITHOUT_CYTHON: "--without-cython --with-distributable-extensions"
-
 jobs:
 
   native_wheels:
@@ -33,19 +29,19 @@ jobs:
         include:
         - wheel-version: 'cp38*'
           TARGET: 'py38'
-          GLOBAL_OPTIONS: "$WITH_CYTHON"
+          GLOBAL_OPTIONS: "--with-cython --with-distributable-extensions"
         - wheel-version: 'cp39*'
           TARGET: 'py39'
-          GLOBAL_OPTIONS: "$WITH_CYTHON"
+          GLOBAL_OPTIONS: "--with-cython --with-distributable-extensions"
         - wheel-version: 'cp310*'
           TARGET: 'py310'
-          GLOBAL_OPTIONS: "$WITH_CYTHON"
+          GLOBAL_OPTIONS: "--with-cython --with-distributable-extensions"
         - wheel-version: 'cp311*'
           TARGET: 'py311'
-          GLOBAL_OPTIONS: "$WITHOUT_CYTHON"
+          GLOBAL_OPTIONS: "--without-cython --with-distributable-extensions"
         - wheel-version: 'cp312*'
           TARGET: 'py312'
-          GLOBAL_OPTIONS: "$WITHOUT_CYTHON"
+          GLOBAL_OPTIONS: "--without-cython --with-distributable-extensions"
 
         exclude:
         - wheel-version: 'cp311*'
@@ -86,19 +82,19 @@ jobs:
         include:
         - wheel-version: 'cp38*'
           TARGET: 'py38'
-          GLOBAL_OPTIONS: "$WITH_CYTHON"
+          GLOBAL_OPTIONS: "--with-cython --with-distributable-extensions"
         - wheel-version: 'cp39*'
           TARGET: 'py39'
-          GLOBAL_OPTIONS: "$WITH_CYTHON"
+          GLOBAL_OPTIONS: "--with-cython --with-distributable-extensions"
         - wheel-version: 'cp310*'
           TARGET: 'py310'
-          GLOBAL_OPTIONS: "$WITH_CYTHON"
+          GLOBAL_OPTIONS: "--with-cython --with-distributable-extensions"
         - wheel-version: 'cp311*'
           TARGET: 'py311'
-          GLOBAL_OPTIONS: "$WITHOUT_CYTHON"
+          GLOBAL_OPTIONS: "--without-cython --with-distributable-extensions"
         - wheel-version: 'cp312*'
           TARGET: 'py312'
-          GLOBAL_OPTIONS: "$WITHOUT_CYTHON"
+          GLOBAL_OPTIONS: "--without-cython --with-distributable-extensions"
     steps:
       - uses: actions/checkout@v4
       - name: Set up QEMU
@@ -124,7 +120,7 @@ jobs:
           overwrite: true
 
   pure_python:
-    name: Build pure wheels (${{ matrix.python-version }})
+    name: pure_python_wheel
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -145,7 +141,7 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: purepython_wheel-${{ matrix.python-version }}
+          name: purepythonwheel
           path: dist/*.whl
           overwrite: true