diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index c9fbba4..8bc6c18 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -11,7 +11,11 @@ on: - src/** branches: - 'main' + release: + types: + - published + workflow_dispatch: # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml new file mode 100644 index 0000000..098f2c7 --- /dev/null +++ b/.github/workflows/publish-release.yml @@ -0,0 +1,224 @@ +name: Publish + +on: + push: + tags: + - v*.*.* + + workflow_dispatch: + +permissions: + contents: read + +jobs: + + make_sdist: + name: Make source distribution 📑 package 📦 + runs-on: ubuntu-latest + steps: + - name: Setup | Harden Runner + uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1 + with: + egress-policy: audit + - name: Setup | Checkout Code + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + fetch-depth: 0 # Optional, use if you use setuptools_scm + submodules: true # Optional, use if you have submodules + - name: Action | Build SDist + run: pipx run build --sdist + - name: Action | Upload Artifacts + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 + with: + name: dist-cibw-sdist + path: dist/*.tar.gz + + build_wheels: + name: Build Python 🐍 wheel 📦 for ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + matrix: + # macos-13 is an intel runner, macos-14 is apple silicon + os: [ubuntu-latest, windows-latest, macos-13, macos-14] + steps: + - name: Setup | Harden Runner + uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1 + with: + egress-policy: audit + - name: Setup | Checkout Code + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - name: Action | Build Wheels + uses: pypa/cibuildwheel@7940a4c0e76eb2030e473a5f864f291f63ee879b # v2.21.0 + - name: Action | Upload Artifacts + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 + with: + name: dist-cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }} + path: ./wheelhouse/*.whl + + build_win_exe: + name: Build standalone executable ⚙️ for Windows 🖥️ + runs-on: [windows-latest] + continue-on-error: true + steps: + - name: Setup | Install python + uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0 + with: + python-version: '3.12' + + - name: Setup | Checkout Code + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + + - name: Setup | Install Dependencies + run: pip install -r requirements.txt -r requirements-exe.txt + - run: pip install . + - run: python setup.py build_ext -i + + - name: Setup | Get the sansmic version number + id: vars + run: | + python -c "import sansmic; print('sansmic_version='+sansmic.__version__)" >> $Env:GITHUB_ENV + echo "sha_short=$(git rev-parse --short HEAD)" >> $Env:GITHUB_ENV + + - name: Action | Run PyInstaller + run: | + pyinstaller --collect-all sansmic --collect-all click --hidden-import sansmic --hidden-import click --hidden-import pandas --hidden-import pybind11 --hidden-import numpy --hidden-import h5py --hidden-import pyyaml --hidden-import lasio -n sansmic --add-binary src/python/sansmic/libsansmic.cp312-win_amd64.pyd:sansmic src/python/sansmic/app.py + + - name: Action | Create examples + run: mkdir dist/sansmic/examples + - run: copy README.md dist/sansmic/README.md + - run: copy LICENSE dist/sansmic/LICENSE.md + - run: copy CHANGELOG.md dist/sansmic/CHANGELOG.md + - run: copy AUTHORS.md dist/sansmic/AUTHORS.md + - run: copy SECURITY.md dist/sansmic/SECURITY.md + - run: sansmic-convert tests/baseline.dat dist/sansmic/examples/baseline.toml + - run: Compress-Archive -Path dist/sansmic -DestinationPath dist/sansmic-${{github.ref_name}}-standalone-win_amd64.zip + + - name: Action | Upload Artifacts + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 + with: + name: dist-exec-windows-latest + path: ./dist/sansmic-*-standalone-win_amd64.zip + + publish-to-gh: + name: Upload artifacts + runs-on: ubuntu-latest + needs: + - build_win_exe + - make_sdist + - build_wheels + environment: + name: release + url: https://github.com/sandialabs/sansmic/releases/tag/${{github.ref_name}} + concurrency: release + + permissions: + id-token: write + contents: write + + steps: + - name: Harden Runner + uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1 + with: + egress-policy: audit + + - name: Setup | Checkout Repository at workflow sha + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + ref: ${{ github.sha }} + + - name: Setup | Download all the dists + uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + with: + pattern: dist-* + path: dist + merge-multiple: true + + - name: Action | Sign the dists with Sigstore + uses: sigstore/gh-action-sigstore-python@f514d46b907ebcd5bedc05145c03b69c1edd8b46 # v3.0.0 + with: + inputs: >- + ./dist/*.zip + ./dist/*.tar.gz + ./dist/*.whl + + - name: Publish | Upload to GitHub Release Assets + run: | + gh release upload ${{github.ref_name}} dist/* + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + publish-to-testpypi: + name: Publish Python 🐍 distribution 📦 to TestPyPI + runs-on: ubuntu-latest + needs: [publish-to-gh] + if: ${{ startsWith(github.ref, 'refs/tags/') && github.repository == 'sandialabs/sansmic' }} # only publish to PyPI on tag pushes + + environment: + name: testpypi + url: https://test.pypi.org/p/sansmic + + permissions: + id-token: write # IMPORTANT: mandatory for trusted publishing + + steps: + - name: Setup | Harden Runner + uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1 + with: + egress-policy: audit + + - name: Setup | Checkout Repository at workflow sha + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + ref: ${{ github.sha }} + + - name: Setup | Download all the dists + uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + with: + pattern: dist-cibw-* + path: dist + merge-multiple: true + + - name: Action | Publish distribution 📦 to TestPyPI + uses: pypa/gh-action-pypi-publish@fb13cb306901256ace3dab689990e13a5550ffaa # release/v1 + with: + skip-existing: true + print-hash: true + verbose: true + attestations: true + repository-url: https://test.pypi.org/legacy/ + + publish-to-pypi: + name: >- + Publish Python 🐍 distribution 📦 to PyPI + if: ${{ startsWith(github.ref, 'refs/tags/') && github.repository == 'sandialabs/sansmic' }} # only publish to PyPI on tag pushes + needs: [publish-to-gh, publish-to-testpypi] + environment: + name: release + url: https://pypi.org/p/sansmic + permissions: + id-token: write + runs-on: ubuntu-latest + + steps: + - name: Setup | Harden Runner + uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1 + with: + egress-policy: audit + + - name: Setup | Checkout Repository at workflow sha + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + ref: ${{ github.sha }} + + - name: Setup | Download all the dists + uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + with: + pattern: dist-cibw-* + path: dist + merge-multiple: true + + - name: Setup | Publish distribution 📦 to PyPI + uses: pypa/gh-action-pypi-publish@fb13cb306901256ace3dab689990e13a5550ffaa # release/v1 + with: + attestations: true + print-hash: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 3de41d2..0000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,122 +0,0 @@ -name: Publish - -on: - release: - types: [released] - -permissions: - contents: read - -jobs: - build_wheels: - name: Build distribution 📦 on ${{ matrix.os }} - runs-on: ${{ matrix.os }} - if: ${{ startsWith(github.ref, 'refs/tags/') && github.repository == 'sandialabs/sansmic' }} # only publish to PyPI on tag pushes - strategy: - matrix: - # macos-13 is an intel runner, macos-14 is apple silicon - os: [ubuntu-latest, windows-latest, macos-13, macos-14] - - steps: - - name: Setup | Harden Runner - uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1 - with: - egress-policy: audit - - - name: Setup | Checkout Code - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - - name: Action | Build Wheels - uses: pypa/cibuildwheel@7940a4c0e76eb2030e473a5f864f291f63ee879b # v2.21.0 - - - name: Action | Upload Artifacts - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 - with: - name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }} - path: ./wheelhouse/*.whl - - make_sdist: - name: Make SDist artifact 📦 - runs-on: ubuntu-latest - if: ${{ startsWith(github.ref, 'refs/tags/') && github.repository == 'sandialabs/sansmic' }} # only publish to PyPI on tag pushes - steps: - - name: Setup | Harden Runner - uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1 - with: - egress-policy: audit - - - name: Setup | Checkout Code - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - fetch-depth: 0 # Optional, use if you use setuptools_scm - submodules: true # Optional, use if you have submodules - - - name: Action | Build SDist - run: pipx run build --sdist - - - name: Action | Upload Artifacts - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 - with: - name: cibw-sdist - path: dist/*.tar.gz - - publish-to-testpypi: - name: Publish Python 🐍 distribution 📦 to TestPyPI - needs: [build_wheels, make_sdist] - runs-on: ubuntu-latest - if: ${{ startsWith(github.ref, 'refs/tags/') && github.repository == 'sandialabs/sansmic' }} # only publish to PyPI on tag pushes - - environment: - name: testpypi - url: https://test.pypi.org/p/sansmic - - permissions: - id-token: write # IMPORTANT: mandatory for trusted publishing - - steps: - - name: Setup | Download all the dists - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 - with: - pattern: cibw-* - path: dist - merge-multiple: true - - - name: Action | Publish distribution 📦 to TestPyPI - uses: pypa/gh-action-pypi-publish@fb13cb306901256ace3dab689990e13a5550ffaa # release/v1 - with: - skip-existing: true - print-hash: true - verbose: true - attestations: true - repository-url: https://test.pypi.org/legacy/ - - publish-to-pypi: - name: >- - Publish Python 🐍 distribution 📦 to PyPI - if: ${{ startsWith(github.ref, 'refs/tags/') && github.repository == 'sandialabs/sansmic' }} # only publish to PyPI on tag pushes - needs: [publish-to-testpypi] - environment: - name: release - url: https://pypi.org/p/sansmic - permissions: - id-token: write - runs-on: ubuntu-latest - - steps: - - name: Setup | Harden Runner - uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1 - with: - egress-policy: audit - - - name: Setup | Download all the dists - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 - with: - pattern: cibw-* - path: dist - merge-multiple: true - - - name: Setup | Publish distribution 📦 to PyPI - uses: pypa/gh-action-pypi-publish@fb13cb306901256ace3dab689990e13a5550ffaa # release/v1 - with: - attestations: true - print-hash: true diff --git a/.github/workflows/semantic-release.yml b/.github/workflows/semantic-release.yml index 4deab5d..8112071 100644 --- a/.github/workflows/semantic-release.yml +++ b/.github/workflows/semantic-release.yml @@ -13,173 +13,19 @@ permissions: contents: read jobs: - check_release: - name: >- - 🔖❓ - Check if release needed + semantic-release: + name: Check if new release 🔖 needed ❔ runs-on: ubuntu-latest + if: ${{ github.ref == 'refs/heads/main' }} environment: - name: release + name: sem-ver concurrency: release - # Only run if this is the primary origin main branch - if: ${{ github.ref == 'refs/heads/main' && github.repository == 'sandialabs/sansmic' }} + outputs: - is_prerelease: ${{ steps.semVer.outputs.is_prerelease }} - released: ${{ steps.semVer.outputs.released }} - version: ${{ steps.semVer.outputs.version }} - tag: ${{ steps.semVer.outputs.tag }} - permissions: - id-token: write - contents: write - steps: - - name: Harden Runner - uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1 - with: - egress-policy: audit - - name: Debug - run: | - echo "## Inputs" >> $GITHUB_STEP_SUMMARY - echo "Is prerelease - " ${{ inputs.is_prerelease }} | tee $GITHUB_STEP_SUMMARY - - name: Setup | Checkout Repository at workflow sha - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - fetch-depth: 0 - ref: ${{ github.sha }} - - name: Setup | Force correct release branch on workflow sha - run: | - git checkout -B ${{ github.ref_name }} ${{ github.sha }} - - name: Setup | Get short commit SHA - id: vars - run: | - echo "short_sha=$(git rev-parse --short HEAD)\n" >> $GITHUB_OUTPUT - - - name: Action | Semantic Release - Update version - id: semVer - # Adjust tag with desired version if applicable. - uses: python-semantic-release/python-semantic-release@c1bcfdbb994243ac7cf419365d5894d6bfb2950e # v9.12.0 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - git_committer_name: "github-actions" - git_committer_email: "actions@users.noreply.github.com" - build: false - changelog: true - commit: true - push: true - tag: false - prerelease: ${{ inputs.is_prerelease }} - vcs_release: false - - - name: Action | Output version info - run: | - echo "" >> $GITHUB_STEP_SUMMARY - echo "## Results of python-semantic-version" >> $GITHUB_STEP_SUMMARY - echo "Released " ${{ steps.semVer.outputs.released }} >> $GITHUB_STEP_SUMMARY - echo "Prerelease " ${{ steps.semVer.outputs.is_prerelease }} >> $GITHUB_STEP_SUMMARY - echo "Version " ${{ steps.semVer.outputs.version }} >> $GITHUB_STEP_SUMMARY - echo "Tag " ${{ steps.semVer.outputs.tag }} >> $GITHUB_STEP_SUMMARY - echo "" >> $GITHUB_STEP_SUMMARY - - make_sdist: - name: >- - 🏗️📑📦 - Make source distribution package - needs: - - check_release - if: ${{ needs.check_release.outputs.released == 'true' }} - runs-on: ubuntu-latest - steps: - - name: Setup | Harden Runner - uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1 - with: - egress-policy: audit - - name: Setup | Checkout Code - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - fetch-depth: 0 # Optional, use if you use setuptools_scm - submodules: true # Optional, use if you have submodules - - name: Action | Build SDist - run: pipx run build --sdist - - name: Action | Upload Artifacts - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 - with: - name: dist-cibw-sdist - path: dist/*.tar.gz - - build_wheels: - name: >- - 🏗️🎡📦 - Build Python wheel for ${{ matrix.os }} - needs: - - check_release - if: ${{ needs.check_release.outputs.released == 'true' }} - runs-on: ${{ matrix.os }} - strategy: - matrix: - # macos-13 is an intel runner, macos-14 is apple silicon - os: [ubuntu-latest, windows-latest, macos-13, macos-14] - steps: - - name: Setup | Harden Runner - uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1 - with: - egress-policy: audit - - name: Setup | Checkout Code - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - name: Action | Build Wheels - uses: pypa/cibuildwheel@7940a4c0e76eb2030e473a5f864f291f63ee879b # v2.21.0 - - name: Action | Upload Artifacts - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 - with: - name: dist-cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }} - path: ./wheelhouse/*.whl - - build_win_exe: - name: >- - 🏗️🖥️💽 - Build standalone executable for Windows - needs: - - check_release - if: ${{ needs.check_release.outputs.released == 'true' }} - runs-on: [windows-latest] - continue-on-error: true - steps: - - name: Setup | Install python - uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0 - with: - python-version: '3.12' - - name: Setup | Checkout Code - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - name: Setup | Install Dependencies - run: | - pip install -r requirements.txt -r requirements-exe.txt - pip install . - python setup.py build_ext -i - - name: Setup | Get the sansmic version number - id: vars - run: | - python -c "import sansmic; print('sansmic_version='+sansmic.__version__)" >> $Env:GITHUB_ENV - echo "sha_short=$(git rev-parse --short HEAD)" >> $Env:GITHUB_ENV - - name: Action | Run PyInstaller - run: | - pyinstaller --collect-all sansmic --collect-all click --hidden-import sansmic --hidden-import click --hidden-import pandas --hidden-import pybind11 --hidden-import numpy --hidden-import h5py --hidden-import pyyaml --hidden-import lasio -n sansmic --add-binary src/python/sansmic/libsansmic.cp312-win_amd64.pyd:sansmic src/python/sansmic/app.py - - name: Action | Create examples - run: | - mkdir dist/sansmic/examples - sansmic-convert tests/baseline.dat dist/sansmic/examples/baseline.toml - Compress-Archive -Path dist/sansmic -DestinationPath dist/sansmic-${{ needs.check_release.outputs.version }}-standalone-win_amd64.zip - - name: Action | Upload Artifacts - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 - with: - name: dist-exec-windows-latest - path: ./dist/sansmic-*-standalone-win_amd64.zip - - cut_release: - name: >- - 🔖✔️ - Create tag and vcs release - runs-on: ubuntu-latest - needs: - - check_release - - build_win_exe - - make_sdist - - build_wheels - environment: - name: release - concurrency: release + is_prerelease: ${{ steps.semantic_release.outputs.is_prerelease }} + released: ${{ steps.semantic_release.outputs.released }} + version: ${{ steps.semantic_release.outputs.version }} + tag: ${{ steps.semantic_release.outputs.tag }} permissions: id-token: write @@ -191,71 +37,46 @@ jobs: with: egress-policy: audit - - name: Debug + - name: Debug | Input variables run: | echo "## Inputs" >> $GITHUB_STEP_SUMMARY - echo ${{ inputs.releaseType }} | tee $GITHUB_STEP_SUMMARY - echo ${{ inputs.force }} | tee $GITHUB_STEP_SUMMARY + echo "Is prerelease - " ${{ inputs.is_prerelease }} | tee $GITHUB_STEP_SUMMARY - name: Setup | Checkout Repository at workflow sha uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: + token: ${{ secrets.SEMANTIC_RELEASE_TOKEN }} fetch-depth: 0 ref: ${{ github.sha }} - - name: Setup | Force correct release branch on workflow sha - run: | - git checkout -B ${{ github.ref_name }} ${{ github.sha }} + run: git checkout -B ${{ github.ref_name }} ${{ github.sha }} - name: Setup | Get short commit SHA id: vars - run: | - echo "short_sha=$(git rev-parse --short HEAD)\n" >> $GITHUB_OUTPUT - - - name: Setup | Download all the dists - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 - with: - pattern: dist-* - path: dist - merge-multiple: true - - - name: Action | Sign the dists with Sigstore - uses: sigstore/gh-action-sigstore-python@f514d46b907ebcd5bedc05145c03b69c1edd8b46 # v3.0.0 - with: - inputs: >- - ./dist/*.zip - ./dist/*.tar.gz - ./dist/*.whl + run: echo "short_sha=$(git rev-parse --short HEAD)\n" >> $GITHUB_OUTPUT - name: Action | Semantic Release - Update version - id: semVer + id: semantic_release # Adjust tag with desired version if applicable. uses: python-semantic-release/python-semantic-release@c1bcfdbb994243ac7cf419365d5894d6bfb2950e # v9.12.0 with: - github_token: ${{ secrets.GITHUB_TOKEN }} + github_token: ${{ secrets.SEMANTIC_RELEASE_TOKEN }} git_committer_name: "github-actions" git_committer_email: "actions@users.noreply.github.com" build: false - changelog: false - commit: false + changelog: true + commit: true push: true tag: true prerelease: ${{ inputs.is_prerelease }} vcs_release: true - - name: Publish | Upload to GitHub Release Assets - uses: python-semantic-release/publish-action@v9.8.9 - if: steps.semVer.outputs.released == 'true' - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - tag: ${{ steps.semVer.outputs.tag }} - - name: Action | Output version info run: | echo "" >> $GITHUB_STEP_SUMMARY echo "## Results of python-semantic-version" >> $GITHUB_STEP_SUMMARY - echo "Released " ${{ steps.semVer.outputs.released }} >> $GITHUB_STEP_SUMMARY - echo "Prerelease " ${{ steps.semVer.outputs.is_prerelease }} >> $GITHUB_STEP_SUMMARY - echo "Version " ${{ steps.semVer.outputs.version }} >> $GITHUB_STEP_SUMMARY - echo "Tag " ${{ steps.semVer.outputs.tag }} >> $GITHUB_STEP_SUMMARY + echo "Released " ${{ steps.semantic_release.outputs.released }} >> $GITHUB_STEP_SUMMARY + echo "Prerelease " ${{ steps.semantic_release.outputs.is_prerelease }} >> $GITHUB_STEP_SUMMARY + echo "Version " ${{ steps.semantic_release.outputs.version }} >> $GITHUB_STEP_SUMMARY + echo "Tag " ${{ steps.semantic_release.outputs.tag }} >> $GITHUB_STEP_SUMMARY echo "" >> $GITHUB_STEP_SUMMARY diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..a490b61 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "githubPullRequests.ignoredPullRequestBranches": [ + "main" + ] +} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ffdb19..e69275a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,35 @@ # CHANGELOG +## v1.0.7 (2024-11-06) + +### Bug Fixes + +* fix(dat-convert): change default conversion behavior to match UM (#94) + +Add additional comments to scenarios converted from .DAT files. Change subsequent-stage cavern SG initialization to match UM-documented behavior rather than the undocumented reset-the-SG behavior that was occurring in the FORTRAN version. ([`932b2d1`](https://github.com/sandialabs/sansmic/commit/932b2d1f09bc8fe600f3e0e6ddeb3e43cd293676)) + +* fix(dat-convert): change default conversion behavior to match sansmic UM (2015) ([`b3fea1c`](https://github.com/sandialabs/sansmic/commit/b3fea1c7eaa7058d91d717c12889c217542c413b)) + +### Documentation + +* docs: Update scenario documentation + +Update to include both -depth and -height configuraiton options for brine injection, production, and interface. ([`d28bdf4`](https://github.com/sandialabs/sansmic/commit/d28bdf4254af3d437b1dfd6bcce2372d5ab37d7a)) + +* docs: update badges ([`0300c09`](https://github.com/sandialabs/sansmic/commit/0300c0959816d5737c35bbddf26ffb035c06989b)) + +### Release + +* release: pull staging into main (#100) ([`6acef4c`](https://github.com/sandialabs/sansmic/commit/6acef4cc0068bd5877b7e4295bd4d9b62e93d73b)) + +### Testing + +* test: rename regression outputs as txt + +Rename regression testing output files to be explicitly .txt to avoid filetype confusion. ([`785716d`](https://github.com/sandialabs/sansmic/commit/785716d985f05a47c81d3ac226dce9916dc43f48)) + + ## v1.0.6-rc.2 (2024-11-04) diff --git a/pyproject.toml b/pyproject.toml index 2566064..da5c36b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ name = "sansmic" description = "Sandia solution mining modeling software" readme = "README.md" requires-python = ">=3.9" -version = "1.0.6-rc.2" +version = "1.0.7" authors = [ { name = "National Technology & Engineering Solutions of Sandia, LLC (NTESS)" }, { name = "SANSMIC Authors (see AUTHORS.md)" }, @@ -94,14 +94,14 @@ version_variables = [ ] [tool.semantic_release.branches.release] -match = "main" +match = "(main|staging)" prerelease_token = "rc" prerelease = false [tool.semantic_release.changelog] template_dir = "templates" default_templates.changelog_file = "CHANGELOG.md" -exclude_commit_patterns = ["build", "ci", "chore", "^Bump", "release", "style", "^Merge branch"] +exclude_commit_patterns = ["build", "ci", "chore", "^Bump", "style", "^Merge branch"] [tool.semantic_release.changelog.environment] block_start_string = "{%" @@ -150,4 +150,4 @@ insecure = false [tool.semantic_release.publish] dist_glob_patterns = ["dist/*"] -upload_to_vcs_release = false +upload_to_vcs_release = true diff --git a/setup.py b/setup.py index 37598d7..94c46d4 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ from setuptools import find_packages, setup from pybind11.setup_helpers import Pybind11Extension, build_ext -__version__ = "1.0.6-rc.2" +__version__ = "1.0.7" here = path.abspath(path.dirname(__file__)) diff --git a/src/python/sansmic/_version.py b/src/python/sansmic/_version.py index b5186b3..94ca773 100644 --- a/src/python/sansmic/_version.py +++ b/src/python/sansmic/_version.py @@ -6,7 +6,7 @@ # # SPDX-License-Identifier: BSD-3-Clause. -__version__ = "1.0.6-rc.2" +__version__ = "1.0.7" copyright = f"""Copyright (c) 2024 National Technology and Engineering Solutions of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the U.S.