From 56092e2e4d3750ac235fd4ed4f05b6f31ebbc898 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Thu, 18 Apr 2024 10:44:25 -0500 Subject: [PATCH 1/3] Update versions for GHA actions --- .github/workflows/ci.yml | 2 +- .github/workflows/publish-pypi.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4c1bd15f..6d82e3fd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: container: openmc/openmc:latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Apt dependencies shell: bash diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml index cf01afee..390560bb 100644 --- a/.github/workflows/publish-pypi.yml +++ b/.github/workflows/publish-pypi.yml @@ -10,9 +10,9 @@ jobs: permissions: id-token: write steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: '3.x' - name: Install dependencies From 63a237c8425ecbfaca9599b47f79202646e3ae8c Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Thu, 18 Apr 2024 11:05:24 -0500 Subject: [PATCH 2/3] Update action for publishing to PyPI --- .github/workflows/publish-pypi.yml | 32 ++++++++++++++++++------------ pyproject.toml | 1 + 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml index 390560bb..ba033def 100644 --- a/.github/workflows/publish-pypi.yml +++ b/.github/workflows/publish-pypi.yml @@ -5,21 +5,27 @@ on: types: [published] jobs: - deploy: + dist: runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - uses: hynek/build-and-inspect-python-package@v2 + + publish: + needs: [dist] + environment: pypi permissions: id-token: write + runs-on: ubuntu-latest + if: github.event_name == 'release' && github.event.action == 'published' + steps: - - uses: actions/checkout@v4 - - name: Set up Python - uses: actions/setup-python@v5 + - uses: actions/download-artifact@v4 with: - python-version: '3.x' - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install build - - name: Build package - run: python -m build - - name: Publish a Python distribution to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 + name: Packages + path: dist + + - uses: pypa/gh-action-pypi-publish@release/v1 diff --git a/pyproject.toml b/pyproject.toml index 98fc069d..5671b3a4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,6 +27,7 @@ classifiers = [ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ] requires-python = ">=3.7" dependencies = [ From 1d2745e04737a40defbc921648d68d54f7766e22 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Thu, 18 Apr 2024 11:16:08 -0500 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a0ffe0db..30b2d2f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,12 +13,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. specifies the directory created in the database ([#107](https://github.com/watts-dev/watts/pull/107)) +### Changes + +* Update recommendations for Dakota version + ([#111](https://github.com/watts-dev/watts/pull/111)) +* Update GitHub Actions workflows ([#112](https://github.com/watts-dev/watts/pull/112)) + ### Fixed * Fixed path to system python executable in dakota plugin * Fixed path for templates rendered from the `extra_template_inputs` argument in `PluginGeneric` and subclasses ([#109](https://github.com/watts-dev/watts/pull/109)) +* Update to fix `PluginDakota` executable + ([#110](https://github.com/watts-dev/watts/pull/110)) ## [0.5.1]