diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 98f5893..e57f40f 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -7,27 +7,93 @@ on: workflow_dispatch: jobs: - build-and-publish: + build: runs-on: ubuntu-latest steps: - name: Checkout sources - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup Python uses: actions/setup-python@v2 with: - python-version: "3.10" + python-version: "3.x" - - name: Install poetry and dependencies - run: | - python -m pip install --upgrade pip - python -m pip install poetry + - name: Install pypa/build + run: >- + python3 -m + pip install + build + --user + - name: Build a binary wheel and a source tarball + run: python3 -m build + - name: Store the distribution packages + uses: actions/upload-artifact@v3 + with: + name: python-package-distributions + path: dist/ + + publish-to-pypi: + name: >- + Publish Python distribution to PyPI + if: startsWith(github.ref, 'refs/tags/') # only publish to PyPI on tag pushes + needs: + - build + runs-on: ubuntu-latest + environment: + name: pypi + url: https://pypi.org/p/compmec-section + permissions: + id-token: write # IMPORTANT: mandatory for trusted publishing + steps: + - name: Download all the dists + uses: actions/download-artifact@v3 + with: + name: python-package-distributions + path: dist/ + - name: Publish distribution 📦 to PyPI + uses: pypa/gh-action-pypi-publish@release/v1 + + github-release: + name: >- + Sign the Python 🐍 distribution 📦 with Sigstore + and upload them to GitHub Release + needs: + - publish-to-pypi + runs-on: ubuntu-latest - - name: Configure poetry - env: - pypi_token: ${{ secrets.PyPI_TOKEN }} - run: poetry config pypi-token.pypi $pypi_token + permissions: + contents: write # IMPORTANT: mandatory for making GitHub Releases + id-token: write # IMPORTANT: mandatory for sigstore - - name: Build and publish - run: poetry publish --build + steps: + - name: Download all the dists + uses: actions/download-artifact@v3 + with: + name: python-package-distributions + path: dist/ + - name: Sign the dists with Sigstore + uses: sigstore/gh-action-sigstore-python@v1.2.3 + with: + inputs: >- + ./dist/*.tar.gz + ./dist/*.whl + - name: Create GitHub Release + env: + GITHUB_TOKEN: ${{ github.token }} + run: >- + gh release create + '${{ github.ref_name }}' + --repo '${{ github.repository }}' + --notes "" + - name: Upload artifact signatures to GitHub Release + env: + GITHUB_TOKEN: ${{ github.token }} + # Upload to GitHub Release using the `gh` CLI. + # `dist/` contains the built packages, and the + # sigstore-produced signatures and certificates. + run: >- + gh release upload + '${{ github.ref_name }}' dist/** + --repo '${{ github.repository }}' + diff --git a/.gitignore b/.gitignore index f2fa633..f2fd9df 100644 --- a/.gitignore +++ b/.gitignore @@ -124,4 +124,4 @@ dmypy.json .pyre/ docs/source/sphinx_gallery_examples/index.rst -console.py +console/* diff --git a/src/compmec/section/bem2d.py b/src/compmec/section/bem2d.py index 90c91e8..a4daa91 100644 --- a/src/compmec/section/bem2d.py +++ b/src/compmec/section/bem2d.py @@ -450,9 +450,10 @@ def solve(self): vector = np.pad(vector, (0, 1), constant_values=0) warpvals = np.linalg.solve(matrix, vector)[:-1] # Now compute torsion center - amatrix, bvector = TorsionConstraintVector(self.__all_vertices[0]) + vertices = self.__all_vertices[0] + amatrix, bvector = TorsionConstraintVector(vertices) bvector += np.einsum("ij,j->i", amatrix, warpvals) - cmatrix = AreaProperties(self.__all_vertices[0]) + cmatrix = AreaProperties(vertices) result = np.linalg.solve(cmatrix, bvector) c0, x0, y0 = result[0], -result[2], result[1] self.__center = (x0, y0)