Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.16.0
current_version = 0.16.1
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>(a|na))+(?P<build>\d+))?
serialize =
{major}.{minor}.{patch}{release}{build}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
20 changes: 12 additions & 8 deletions .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,28 @@
name: ⚠️ Build production package and release on pypi

on:
workflow_dispatch:
release:
types: [published]

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: >-
Expand All @@ -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 }}
uses: pypa/gh-action-pypi-publish@release/v1
17 changes: 10 additions & 7 deletions .github/workflows/test-pypi-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: >-
Expand All @@ -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
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",