Skip to content

Commit

Permalink
Merge branch 'main' into cwa/close-213-support-oteapi-v0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
CasperWA authored Sep 3, 2024
2 parents 6cb82ee + 5a4f046 commit c0253f3
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 5 deletions.
35 changes: 31 additions & 4 deletions .github/workflows/cd_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- published

jobs:
publish-package-and-docs:
build:
name: External
uses: SINTEF/ci-cd/.github/workflows/[email protected]
if: github.repository == 'SINTEF/oteapi-optimade' && startsWith(github.ref, 'refs/tags/v')
Expand All @@ -21,8 +21,11 @@ jobs:
release_branch: main
install_extras: "[dev]"
python_version_build: "3.9"
build_cmd: "pip install -U flit && flit build"
publish_on_pypi: true
build_libs: flit
build_cmd: "flit build"
build_dir: "dist"
publish_on_pypi: false
upload_distribution: true

# Documentation
update_docs: true
Expand All @@ -31,5 +34,29 @@ jobs:
changelog_exclude_labels: "skip_changelog,duplicate,question,invalid,wontfix"

secrets:
PyPI_token: ${{ secrets.PYPI_TOKEN }}
PAT: ${{ secrets.RELEASE_PAT }}

publish:
name: Publish to PyPI
needs: build
runs-on: ubuntu-latest

# Using environments is recommended by PyPI when using Trusted Publishers
environment:
name: pypi
url: https://pypi.org/project/oteapi-optimade

# The id-token:write permission is required by the PyPI upload action for
# Trusted Publishers
permissions:
id-token: write

steps:
- name: Download distribution
uses: actions/download-artifact@v4
with:
name: dist # The artifact will always be called 'dist'
path: dist

- name: Publish to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,27 @@
# Changelog

## [Unreleased](https://github.com/SINTEF/oteapi-optimade/tree/HEAD)

[Full Changelog](https://github.com/SINTEF/oteapi-optimade/compare/v0.5.1...HEAD)

**Fixed bugs:**

- Use Trusted Publishers with PyPI [\#252](https://github.com/SINTEF/oteapi-optimade/issues/252)

## [v0.5.1](https://github.com/SINTEF/oteapi-optimade/tree/v0.5.1) (2024-09-03)

[Full Changelog](https://github.com/SINTEF/oteapi-optimade/compare/v0.5.0...v0.5.1)

## Update to latest dependencies

Update dependencies to support the latest core libraries.

This release is done almost immediately prior to the v0.6.0.dev0 release, which will support the upcoming re-design of OTEAPI Core and the use of sessions.

**Merged pull requests:**

- Use Trusted Publishers for publishing on PyPI [\#253](https://github.com/SINTEF/oteapi-optimade/pull/253) ([CasperWA](https://github.com/CasperWA))

## [v0.5.0](https://github.com/SINTEF/oteapi-optimade/tree/v0.5.0) (2024-03-07)

[Full Changelog](https://github.com/SINTEF/oteapi-optimade/compare/v0.4.2...v0.5.0)
Expand Down
2 changes: 1 addition & 1 deletion oteapi_optimade/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

import logging

__version__ = "0.5.0"
__version__ = "0.5.1"
__author__ = "Casper Welzel Andersen"
__author_email__ = "[email protected]"

Expand Down

0 comments on commit c0253f3

Please sign in to comment.