Merge pull request #206 from mfem/fix_release_workflow

Fix release workflow
mfem · Jan 10, 2024 · cecfc48 · cecfc48
2 parents 2b25c68 + 52e2986
commit cecfc48
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 121 deletions.
diff --git a/.github/workflows/release_binary.yml b/.github/workflows/release_binary.yml
@@ -25,6 +25,7 @@ jobs:
           export PATH=/opt/python/cp37-cp37m/bin:$PATH
 
           pip3 install wheel six auditwheel twine
+          pip3 install urllib3==1.26.6    # use older version to avoid OpenSSL vesion issue
           pip3 install numpy==1.21.6
           #if [ -f requirements.txt ]; then
           #   pip3 install -r requirements.txt
@@ -35,11 +36,11 @@ jobs:
           ls -l dist/
           #python3 -m twine upload --repository-url https://test.pypi.org/legacy/ --password ${{ secrets.TEST_PYPI_TOKEN }} --username __token__ --verbose dist/*
           python3 -m twine upload --password ${{ secrets.PYPI_TOKEN }} --username __token__ --verbose dist/*
-  make_binary_3_7_8_9:
+  make_binary_3_7_8_9_10:
     needs: make_sdist
     strategy:
       matrix:
-        pythonpath: ["cp37-cp37m", "cp38-cp38", "cp39-cp39"]
+        pythonpath: ["cp37-cp37m", "cp38-cp38", "cp39-cp39","cp310-cp310"]
 
     runs-on: ubuntu-latest
     container: quay.io/pypa/manylinux2014_x86_64
@@ -59,6 +60,7 @@ jobs:
           ls -l /opt/python/
           export PATH=/opt/python/${{ matrix.pythonpath }}/bin:$PATH
           pip3 install six auditwheel twine
+          pip3 install urllib3==1.26.6    # use older version to avoid OpenSSL vesion issue
 
           pip3 install numpy==1.21.6
           pip3 install numba-scipy
@@ -89,59 +91,3 @@ jobs:
           ls -l dist/
           #python3 -m twine upload --repository-url https://test.pypi.org/legacy/ --password ${{ secrets.TEST_PYPI_TOKEN }} --username __token__ --verbose dist/*
           python3 -m twine upload --password ${{ secrets.PYPI_TOKEN }} --username __token__ --verbose dist/*
-
-  make_binary_3_10:
-    needs: make_sdist
-    strategy:
-      matrix:
-        pythonpath: ["cp310-cp310"]
-
-    runs-on: ubuntu-latest
-    container: quay.io/pypa/manylinux_2_24_x86_64
-    #container: node:10.16-jessie
-    steps:
-      - name: build package
-        run: |
-          echo It runs in the container instead of the VM.
-          #
-          git clone https://github.com/mfem/PyMFEM.git
-          cd PyMFEM
-          #
-          REF=$(echo ${GITHUB_REF#refs/heads/})
-          echo "!!!!!!: "$REF
-          git checkout $REF
-          #
-          ls -l /opt/python/
-          export PATH=/opt/python/${{ matrix.pythonpath }}/bin:$PATH
-
-          pip3 install six auditwheel twine
-          pip3 install numba-scipy
-          if [ -f requirements.txt ]; then
-             pip3 install -r requirements.txt
-          fi
-          CWD=$PWD
-          ls -l
-
-          apt-get update
-          apt-get install -y zlib1g-dbg
-          apt-get install -y chrpath
-
-          mkdir dist
-
-          # build wheel and check it
-          python3 -m pip wheel ./ --verbose --no-deps
-          pip3 install *.whl
-          cd test
-          python run_examples.py -serial -verbose -ex ex1
-          cd ..
-
-          rm -rf dist/*
-          export LD_LIBRARY_PATH=${CWD}/external/mfem/cmbuild_ser/:$LD_LIBRARY_PATH
-
-          rm -rf wheelhouse/*
-          auditwheel repair *.whl
-          rm -rf dist/*
-
-          mv wheelhouse/* dist/
-          ls -l dist/
-          python3 -m twine upload --password ${{ secrets.PYPI_TOKEN }} --username __token__ --verbose dist/*
diff --git a/.github/workflows/testrelease_binary.yml b/.github/workflows/testrelease_binary.yml
@@ -25,7 +25,7 @@ jobs:
           export PATH=/opt/python/cp37-cp37m/bin:$PATH
 
           pip3 install wheel six auditwheel twine
-          pip3 install urllib3==1.26.6	  # use older version to avoid OpenSSL vesion issue
+          pip3 install urllib3==1.26.6    # use older version to avoid OpenSSL vesion issue
           pip3 install numpy==1.21.6
           #if [ -f requirements.txt ]; then
           #   pip3 install -r requirements.txt
@@ -36,11 +36,11 @@ jobs:
           ls -l dist/
           python3 -m twine upload --repository-url https://test.pypi.org/legacy/ --password ${{ secrets.TEST_PYPI_TOKEN }} --username __token__ --verbose dist/*
           #python3 -m twine upload --password ${{ secrets.PYPI_TOKEN }} --username __token__ --verbose dist/*
-  make_binary_3_7_8_9:
+  make_binary_3_7_8_9_10:
     needs: make_sdist
     strategy:
       matrix:
-        pythonpath: ["cp37-cp37m", "cp38-cp38", "cp39-cp39"]
+        pythonpath: ["cp37-cp37m", "cp38-cp38", "cp39-cp39", "cp310-cp310"]
 
     runs-on: ubuntu-latest
     container: quay.io/pypa/manylinux2014_x86_64
@@ -62,6 +62,7 @@ jobs:
           pip3 install six auditwheel twine
 
           pip3 install numpy==1.21.6
+          pip3 install urllib3==1.26.6    # use older version to avoid OpenSSL vesion issue
           pip3 install numba-scipy
           if [ -f requirements.txt ]; then
              pip3 install -r requirements.txt
@@ -89,62 +90,4 @@ jobs:
 
           ls -l dist/
           python3 -m twine upload --repository-url https://test.pypi.org/legacy/ --password ${{ secrets.TEST_PYPI_TOKEN }} --username __token__ --verbose dist/*
-          #python3 -m twine upload --password ${{ secrets.PYPI_TOKEN }} --username __token__ --verbose dist/*
-
-  make_binary_3_10:
-    needs: make_sdist
-    strategy:
-      matrix:
-        pythonpath: ["cp310-cp310"]
-
-    runs-on: ubuntu-latest
-    container: quay.io/pypa/manylinux_2_24_x86_64
-    #container: node:10.16-jessie
-    steps:
-      - name: build package
-        run: |
-          echo It runs in the container instead of the VM.
-          #
-          git clone https://github.com/mfem/PyMFEM.git
-          cd PyMFEM
-          #
-          REF=$(echo ${GITHUB_REF#refs/heads/})
-          echo "!!!!!!: "$REF
-          git checkout $REF
-          #
-          ls -l /opt/python/
-          export PATH=/opt/python/${{ matrix.pythonpath }}/bin:$PATH
-
-          pip3 install six auditwheel twine
-          pip3 install numba-scipy
-          if [ -f requirements.txt ]; then
-             pip3 install -r requirements.txt
-          fi
-          CWD=$PWD
-          ls -l
-
-          apt-get update
-          apt-get install -y zlib1g-dbg
-          apt-get install -y chrpath
-
-          mkdir dist
-
-          # build wheel and check it
-          python3 -m pip wheel ./ --verbose --no-deps
-          pip3 install *.whl
-          cd test
-          python run_examples.py -serial -verbose -ex ex1
-          cd ..
-
-          rm -rf dist/*
-          export LD_LIBRARY_PATH=${CWD}/external/mfem/cmbuild_ser/:$LD_LIBRARY_PATH
-
-          rm -rf wheelhouse/*
-          auditwheel repair *.whl
-          rm -rf dist/*
-
-          mv wheelhouse/* dist/
-
-          ls -l dist/
-          python3 -m twine upload --repository-url https://test.pypi.org/legacy/ --password ${{ secrets.TEST_PYPI_TOKEN }} --username __token__ --verbose dist/*
-          #python3 -m twine upload --password ${{ secrets.PYPI_TOKEN }} --username __token__ --verbose dist/*
+          #python3 -m twine upload --password ${{ secrets.PYPI_TOKEN }} --username __token__ --verbose dist/*
diff --git a/mfem/__init__.py b/mfem/__init__.py
@@ -20,5 +20,5 @@ def debug_print(message):
 
     print(message)
 
-__version__ = '4.6.0.0rc4'
+__version__ = '4.6.0.0rc8'