diff --git a/.bumpversion.cfg b/.bumpversion.cfg index f22ed637..817b04f3 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.16.0 +current_version = 0.16.1 parse = (?P\d+)\.(?P\d+)\.(?P\d+)((?P(a|na))+(?P\d+))? serialize = {major}.{minor}.{patch}{release}{build} diff --git a/.github/workflows/ci-production.yml b/.github/workflows/ci-production.yml index ce18c2e9..099a273e 100644 --- a/.github/workflows/ci-production.yml +++ b/.github/workflows/ci-production.yml @@ -33,7 +33,7 @@ jobs: - name: create package run: python -m build --sdist - name: import open-mastr - run: python -m pip install ./dist/open_mastr-0.16.0.tar.gz + run: python -m pip install ./dist/open_mastr-0.16.1.tar.gz - name: Create credentials file env: MASTR_TOKEN: ${{ secrets.MASTR_TOKEN }} diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index d4a7bea9..be39ed61 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.github/workflows/pypi-publish.yml @@ -1,6 +1,7 @@ name: ⚠️ Build production package and release on pypi on: + workflow_dispatch: release: types: [published] @@ -8,15 +9,20 @@ jobs: build-n-publish: name: Build and publish Python 🐍 distributions 📦 to PyPI runs-on: ubuntu-latest - environment: pypi-publish + environment: + name: pypi + url: https://pypi.org/p/open-mastr + + permissions: + id-token: write steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: production - - name: Set up Python 3.10 - uses: actions/setup-python@v3 + - name: Set up Python 3.11 + uses: actions/setup-python@v6 with: - python-version: "3.10" + python-version: "3.11" - name: Install pypa/build run: >- @@ -33,6 +39,4 @@ jobs: --outdir dist/ - name: Publish distribution 📦 to PyPI if: startsWith(github.ref, 'refs/tags') - uses: pypa/gh-action-pypi-publish@release/v1 - with: - password: ${{ secrets.PYPI }} \ No newline at end of file + uses: pypa/gh-action-pypi-publish@release/v1 \ No newline at end of file diff --git a/.github/workflows/test-pypi-publish.yml b/.github/workflows/test-pypi-publish.yml index 83c19222..6e6ad5a5 100644 --- a/.github/workflows/test-pypi-publish.yml +++ b/.github/workflows/test-pypi-publish.yml @@ -8,15 +8,19 @@ on: jobs: build-n-publish: - name: Build and publish Python 🐍 distributions 📦 to TestPyPI + name: "[TEST RELEASE] Build and publish Python 🐍 distributions 📦 to TestPyPI" runs-on: ubuntu-latest - environment: pypi-publish + environment: + name: pypi + url: https://pypi.org/p/open-mastr + permissions: + id-token: write steps: - - uses: actions/checkout@v4 - - name: Set up Python 3.10 - uses: actions/setup-python@v3 + - uses: actions/checkout@v6 + - name: Set up Python 3.11 + uses: actions/setup-python@v6 with: - python-version: "3.10" + python-version: "3.11" - name: Install pypa/build run: >- @@ -34,6 +38,5 @@ jobs: - name: Publish distribution 📦 to Test PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: - password: ${{ secrets.PYPI_TEST }} repository-url: https://test.pypi.org/legacy/ verbose: true \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index f9fa7b0d..0e81a0c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,12 +9,20 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/ ## [v0.XX.X] unreleased - 202X-XX-XX ### Added +### Changed + +### Removed + +## [v0.16.1] Hotfix - 2025-12-17 + ### Changed - Adapt introduction text in README and docs [#647](https://github.com/OpenEnergyPlatform/open-MaStR/pull/647) - Hotfix of date selection and incorporate new url structure [#699](https://github.com/OpenEnergyPlatform/open-MaStR/pull/699) -### Removed +- Use trusted publishing on pypi + [#685](https://github.com/OpenEnergyPlatform/open-MaStR/pull/685) + ## [v0.16.0] Partial downloads with open-MaStR PartialPumpkinPull - 2025-11-26 diff --git a/CITATION.cff b/CITATION.cff index d496ecf2..4f23f38c 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -41,7 +41,7 @@ authors: title: "open-MaStR" type: software license: AGPL-3.0 -version: 0.16.0 +version: 0.16.1 doi: -date-released: 2025-11-26 +date-released: 2025-12-17 url: "https://github.com/OpenEnergyPlatform/open-MaStR/" diff --git a/pyproject.toml b/pyproject.toml index 5871bfbe..074ba12e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "open_mastr" -version = "0.16.0" +version = "0.16.1" dependencies = [ "pandas>=2.2.2", "numpy", @@ -79,4 +79,4 @@ open_mastr = [ include = ["open_mastr", "open_mastr.soap_api", "open_mastr.soap_api.metadata", "open_mastr.utils", "open_mastr.utils.config", "open_mastr.xml_download"] # package names should match these glob patterns (["*"] by default) # from setup.py - not yet included in here -# download_url="https://github.com/OpenEnergyPlatform/open-MaStR/archive""/refs/tags/v0.16.0.tar.gz", +# download_url="https://github.com/OpenEnergyPlatform/open-MaStR/archive""/refs/tags/v0.16.1.tar.gz",