From ea4ad6c174d5f00b40fb69188d8c9bc9d8ea25d9 Mon Sep 17 00:00:00 2001 From: Claas Date: Tue, 27 Feb 2024 17:19:03 +0100 Subject: [PATCH 1/3] Changed the publishing workflow to use OpenID Connect (Trusted Publisher Management) when publishing to PyPI --- .github/workflows/_publish_package.yml | 15 +++++---------- .github/workflows/publish_release.yml | 2 -- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/.github/workflows/_publish_package.yml b/.github/workflows/_publish_package.yml index fe0b5b63..4ead0d4b 100644 --- a/.github/workflows/_publish_package.yml +++ b/.github/workflows/_publish_package.yml @@ -1,22 +1,17 @@ name: Publish Package to pypi -on: - workflow_call: - secrets: - PYPI_API_TOKEN: - required: true +on: workflow_call jobs: publish: name: Publish package runs-on: ubuntu-latest - environment: pypi + environment: release + permissions: + id-token: write steps: - uses: actions/download-artifact@v3 with: name: artifact path: ./dist/ - - uses: pypa/gh-action-pypi-publish@v1.5.2 - with: - user: __token__ - password: ${{ secrets.PYPI_API_TOKEN }} + - uses: pypa/gh-action-pypi-publish@release/v1 diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index abb2ce7e..9bf6d7c7 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -13,8 +13,6 @@ jobs: needs: - build_package uses: ./.github/workflows/_publish_package.yml - secrets: - PYPI_API_TOKEN: ${{ secrets.PYPI_API_TOKEN }} merge_into_release: uses: ./.github/workflows/_merge_into_release.yml secrets: From 21c6870c3cec8011c9996e67dc8dc7242f589d07 Mon Sep 17 00:00:00 2001 From: Claas Date: Tue, 27 Feb 2024 17:23:02 +0100 Subject: [PATCH 2/3] updated copyright statement in README.md and conf.py --- README.md | 8 ++++---- docs/source/conf.py | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index aaad026f..39c6fbb4 100644 --- a/README.md +++ b/README.md @@ -103,7 +103,7 @@ _For a detailed documentation of the dictIO dict file format used by farn, see [ ## Meta -Copyright (c) 2024 [DNV](https://www.dnv.com) [open source](https://github.com/dnv-opensource) +Copyright (c) 2024 [DNV](https://www.dnv.com) SE. All rights reserved. Frank Lumpitzsch – [@LinkedIn](https://www.linkedin.com/in/frank-lumpitzsch-23013196/) – frank.lumpitzsch@dnv.com @@ -118,9 +118,9 @@ Distributed under the MIT license. See [LICENSE](LICENSE.md) for more informatio ## Contributing 1. Fork it () -2. Create your branch (`git checkout -b myBranchName`) -3. Commit your changes (e.g. `git commit -m 'place a descriptive commit message here'`) -4. Push to the branch (e.g. `git push origin myBranchName`) +2. Create your branch (`git checkout -b my-branch-name`) +3. Commit your changes (`git commit -am 'place a descriptive commit message here'`) +4. Push to the branch (`git push origin my-branch-name`) 5. Create a new Pull Request in GitHub For your contribution, please make sure you follow the [STYLEGUIDE](STYLEGUIDE.md) before creating the Pull Request. diff --git a/docs/source/conf.py b/docs/source/conf.py index d2cfc659..3fbed284 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -15,10 +15,11 @@ sys.path.insert(0, os.path.abspath("../../src")) + # -- Project information ----------------------------------------------------- project = "ospx" -copyright = "2024, DNV. Frank Lumpitzsch, Claas Rostock, Seung Hyeon Yoo" +copyright = "2024, DNV SE. All rights reserved." author = "Frank Lumpitzsch, Claas Rostock, Seung Hyeon Yoo" # The full version, including alpha/beta/rc tags From 8ce88a8086f74ea5084bd19080b1146872895752 Mon Sep 17 00:00:00 2001 From: Claas Date: Tue, 27 Feb 2024 17:30:41 +0100 Subject: [PATCH 3/3] updated CHANGELOG.md --- CHANGELOG.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bba2938..350afc14 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,11 +5,13 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e ## [Unreleased] +### Changed +* Changed publishing workflow to use OpenID Connect (Trusted Publisher Management) when publishing to PyPI +* Updated copyright statement + ### Dependencies * updated to dictIO>=0.3.3 (from dictIO>=0.3.1) -* -/- - ## [0.2.13] - 2024-02-21