From 1c7344e18da0c50c32997f94a76c1a12133a119b Mon Sep 17 00:00:00 2001 From: Clemens Prescher Date: Tue, 14 Nov 2023 17:36:28 +0100 Subject: [PATCH] Prepare for 1.4.4 Release --- .github/workflows/CD.yml | 41 ++++++++++++++++++++-------------------- changelog.md | 5 +++++ glassure/__init__.py | 2 +- pyproject.toml | 2 +- 4 files changed, 27 insertions(+), 23 deletions(-) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 0839525..5187f25 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -3,9 +3,8 @@ name: CD on: - [push] - # release: - # types: [published] + release: + types: [published] jobs: build_package: @@ -42,23 +41,23 @@ jobs: name: wheels path: dist/* - # pypi-publish: - # name: Upload release to PyPI - # needs: build_package - # runs-on: ubuntu-latest - # environment: - # name: pypi - # url: https://pypi.org/p/glassure/ - # permissions: - # id-token: write - # steps: - # - uses: actions/download-artifact@v3 - # with: - # name: wheels - # path: dist + pypi-publish: + name: Upload release to PyPI + needs: build_package + runs-on: ubuntu-latest + environment: + name: pypi + url: https://pypi.org/p/glassure/ + permissions: + id-token: write + steps: + - uses: actions/download-artifact@v3 + with: + name: wheels + path: dist - # - name: check the dist folder - # run: ls dist + - name: check the dist folder + run: ls dist - # - name: Publish to PyPI - # uses: pypa/gh-action-pypi-publish@release/v1 \ No newline at end of file + - name: Publish to PyPI + uses: pypa/gh-action-pypi-publish@release/v1 \ No newline at end of file diff --git a/changelog.md b/changelog.md index 4df87b8..48d66fc 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,8 @@ +## 1.4.4 (2023/11/14) + +### Bugfixes +- subtraction and addition of patterns works now correctly when both have different x values + ## 1.4.3 (2023/11/02) ### Bugfixes diff --git a/glassure/__init__.py b/glassure/__init__.py index ee23750..64a2bfc 100644 --- a/glassure/__init__.py +++ b/glassure/__init__.py @@ -1,2 +1,2 @@ # -*- coding: utf8 -*- -__version__ = '1.4.3' +__version__ = '1.4.3.post1.dev0+5a8281b' diff --git a/pyproject.toml b/pyproject.toml index 98e7f6e..047d9fa 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "glassure" -version = "1.4.3" +version = "1.4.4" description = "API and GUI for analysis of X-ray total scattering data" authors = ["Clemens Prescher "] license = "MIT"