From c506a34d02beb1e9e168f6c6f7318aafb4732a6c Mon Sep 17 00:00:00 2001 From: Matthew Scroggs Date: Fri, 24 Nov 2023 17:23:04 +0000 Subject: [PATCH 1/4] update workflow --- .github/workflows/push-packages.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/push-packages.yml b/.github/workflows/push-packages.yml index 4a540f97..ec29f51b 100644 --- a/.github/workflows/push-packages.yml +++ b/.github/workflows/push-packages.yml @@ -3,8 +3,8 @@ name: 📦 Packaging on: push: # Sequence of patterns matched against refs/tags - tags: - - 'v*' + #tags: + # - 'v*' jobs: pypi: @@ -12,15 +12,14 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@master - - name: Set up Python 3.10 + - name: Set up Python 3.12 uses: actions/setup-python@v1 with: python-version: "3.12" - - name: Build a binary wheel and a source tarball + - name: Build a wheel run: | - pip install wheel - python setup.py bdist_wheel - python setup.py sdist --formats=gztar + python3 -m pip install build + python3 -m build . - name: Publish to PyPI if: startsWith(github.ref, 'refs/tags') uses: pypa/gh-action-pypi-publish@master From c26ae45bdce707f80ed1fff8656a43ad3d1f8750 Mon Sep 17 00:00:00 2001 From: Matthew Scroggs Date: Fri, 24 Nov 2023 17:24:45 +0000 Subject: [PATCH 2/4] version --- ++version.py | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/++version.py b/++version.py index e2599c3d..413ef86d 100644 --- a/++version.py +++ b/++version.py @@ -47,7 +47,7 @@ new_setup = "" with open("pyproject.toml") as f: for line in f: - if 'version ="' in line: + if 'version = "' in line: new_setup += f'version = "{new_version_str}"\n' else: new_setup += line diff --git a/pyproject.toml b/pyproject.toml index 63d978c0..1b711cb5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ requires = ["flit_core >=3.8.0,<4"] [project] name = "symfem" -version = "2023.8.2" +version = "2023.11.0" description = "a symbolic finite element definition library" readme = "README.md" requires-python = ">=3.8.0" From 30990702fa263328cbfb2a1fa9cd699c4b8e23f4 Mon Sep 17 00:00:00 2001 From: Matthew Scroggs Date: Fri, 24 Nov 2023 17:27:20 +0000 Subject: [PATCH 3/4] force push to pypi --- .github/workflows/push-packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-packages.yml b/.github/workflows/push-packages.yml index ec29f51b..f01d46ef 100644 --- a/.github/workflows/push-packages.yml +++ b/.github/workflows/push-packages.yml @@ -21,7 +21,7 @@ jobs: python3 -m pip install build python3 -m build . - name: Publish to PyPI - if: startsWith(github.ref, 'refs/tags') + #if: startsWith(github.ref, 'refs/tags') uses: pypa/gh-action-pypi-publish@master with: password: ${{ secrets.pypi_password }} From 8a7b3154331baa69284ea9dbb7e4453262c9cc6e Mon Sep 17 00:00:00 2001 From: Matthew Scroggs Date: Fri, 24 Nov 2023 17:27:43 +0000 Subject: [PATCH 4/4] only package if release --- .github/workflows/push-packages.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/push-packages.yml b/.github/workflows/push-packages.yml index f01d46ef..37c8059f 100644 --- a/.github/workflows/push-packages.yml +++ b/.github/workflows/push-packages.yml @@ -3,8 +3,8 @@ name: 📦 Packaging on: push: # Sequence of patterns matched against refs/tags - #tags: - # - 'v*' + tags: + - 'v*' jobs: pypi: @@ -21,7 +21,7 @@ jobs: python3 -m pip install build python3 -m build . - name: Publish to PyPI - #if: startsWith(github.ref, 'refs/tags') + if: startsWith(github.ref, 'refs/tags') uses: pypa/gh-action-pypi-publish@master with: password: ${{ secrets.pypi_password }}