From fc77023b46a3651907d1f1a528f782aed47390c3 Mon Sep 17 00:00:00 2001 From: Syun'ichi Shiraiwa Date: Tue, 9 Jan 2024 20:34:59 -0500 Subject: [PATCH 1/5] fix typo --- mfem/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mfem/__init__.py b/mfem/__init__.py index 1481e9e1..88e41389 100644 --- 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.0rc5' From 1a9276f2280647b091f4c60d977c428057b37b9a Mon Sep 17 00:00:00 2001 From: Syun'ichi Shiraiwa Date: Tue, 9 Jan 2024 20:53:14 -0500 Subject: [PATCH 2/5] added more urllib3==1.26.6 and addressing debian security issue --- .github/workflows/release_binary.yml | 2 ++ .github/workflows/testrelease_binary.yml | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release_binary.yml b/.github/workflows/release_binary.yml index 7948c6c5..40e167cd 100644 --- 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 @@ -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 diff --git a/.github/workflows/testrelease_binary.yml b/.github/workflows/testrelease_binary.yml index dd5a19a7..2bd5777a 100644 --- 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 @@ -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 @@ -105,6 +106,9 @@ jobs: run: | echo It runs in the container instead of the VM. # + echo "deb http://security.debian.org/debian-security bullseye-security main contrib non-free" > /etc/apt/sources.list + apt-get update + # git clone https://github.com/mfem/PyMFEM.git cd PyMFEM # @@ -116,6 +120,7 @@ jobs: 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 numba-scipy if [ -f requirements.txt ]; then pip3 install -r requirements.txt From 945af37574d3ecfea77f71197282ced37663ff8f Mon Sep 17 00:00:00 2001 From: Syun'ichi Shiraiwa Date: Tue, 9 Jan 2024 20:53:59 -0500 Subject: [PATCH 3/5] attemping with rc6 --- mfem/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mfem/__init__.py b/mfem/__init__.py index 88e41389..8bb45c86 100644 --- a/mfem/__init__.py +++ b/mfem/__init__.py @@ -20,5 +20,5 @@ def debug_print(message): print(message) -__version__ = '4.6.0.0rc5' +__version__ = '4.6.0.0rc6' From d938298e2e0426d1bebbab55ce6f5e8516b24a48 Mon Sep 17 00:00:00 2001 From: Syun'ichi Shiraiwa Date: Tue, 9 Jan 2024 21:10:31 -0500 Subject: [PATCH 4/5] attempting rc7 --- .github/workflows/testrelease_binary.yml | 2 +- mfem/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/testrelease_binary.yml b/.github/workflows/testrelease_binary.yml index 2bd5777a..23c4ba93 100644 --- a/.github/workflows/testrelease_binary.yml +++ b/.github/workflows/testrelease_binary.yml @@ -129,7 +129,7 @@ jobs: ls -l apt-get update - apt-get install -y zlib1g-dbg + #apt-get install -y zlib1g-dbg apt-get install -y chrpath mkdir dist diff --git a/mfem/__init__.py b/mfem/__init__.py index 8bb45c86..0f81db9d 100644 --- a/mfem/__init__.py +++ b/mfem/__init__.py @@ -20,5 +20,5 @@ def debug_print(message): print(message) -__version__ = '4.6.0.0rc6' +__version__ = '4.6.0.0rc7' From 52e2986dd1b8ec4356f802d46e4694c53cbe48db Mon Sep 17 00:00:00 2001 From: Syun'ichi Shiraiwa Date: Tue, 9 Jan 2024 21:48:32 -0500 Subject: [PATCH 5/5] removing the use of manylinux_2_24_x86_64 --- .github/workflows/release_binary.yml | 60 +-------------------- .github/workflows/testrelease_binary.yml | 68 ++---------------------- mfem/__init__.py | 2 +- 3 files changed, 6 insertions(+), 124 deletions(-) diff --git a/.github/workflows/release_binary.yml b/.github/workflows/release_binary.yml index 40e167cd..3b5ecffa 100644 --- a/.github/workflows/release_binary.yml +++ b/.github/workflows/release_binary.yml @@ -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 @@ -91,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/* \ No newline at end of file diff --git a/.github/workflows/testrelease_binary.yml b/.github/workflows/testrelease_binary.yml index 23c4ba93..15b09905 100644 --- a/.github/workflows/testrelease_binary.yml +++ b/.github/workflows/testrelease_binary.yml @@ -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 @@ -90,66 +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. - # - echo "deb http://security.debian.org/debian-security bullseye-security main contrib non-free" > /etc/apt/sources.list - apt-get update - # - 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 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 - 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/* \ No newline at end of file diff --git a/mfem/__init__.py b/mfem/__init__.py index 0f81db9d..b7e4216e 100644 --- a/mfem/__init__.py +++ b/mfem/__init__.py @@ -20,5 +20,5 @@ def debug_print(message): print(message) -__version__ = '4.6.0.0rc7' +__version__ = '4.6.0.0rc8'