From e010923c1c052076fffdd0188aedc2a46b8db8f7 Mon Sep 17 00:00:00 2001 From: dachengx Date: Mon, 15 Jan 2024 02:17:15 -0600 Subject: [PATCH 1/7] Update HISTORY.md --- HISTORY.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/HISTORY.md b/HISTORY.md index 16c3e50f3..09ecd0ad3 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,12 @@ +1.5.6 / 2024-01-15 +--------------------- +* `np.float` is deprecated by @dachengx in https://github.com/AxFoundation/strax/pull/789 +* Update pymongo and solve the error of pytest by @dachengx in https://github.com/AxFoundation/strax/pull/791 + + +**Full Changelog**: https://github.com/AxFoundation/strax/compare/v1.5.5...v1.5.6 + + 1.5.5 / 2023-12-21 --------------------- * Update readthedocs configuration by @dachengx in https://github.com/AxFoundation/strax/pull/763 From 9dfc20ca8d27ec74c0cdd950ecc9db306572bde6 Mon Sep 17 00:00:00 2001 From: dachengx Date: Mon, 15 Jan 2024 02:17:45 -0600 Subject: [PATCH 2/7] =?UTF-8?q?Bump=20version:=201.5.5=20=E2=86=92=201.5.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- docs/source/conf.py | 4 ++-- setup.py | 2 +- strax/__init__.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index d27c79bc4..e32b0ad8a 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.5.5 +current_version = 1.5.6 files = setup.py strax/__init__.py docs/source/conf.py commit = True tag = True diff --git a/docs/source/conf.py b/docs/source/conf.py index 5e6a34eb4..dcb615d0c 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -66,9 +66,9 @@ # built documents. # # The short X.Y version. -version = "1.5.5" +version = "1.5.6" # The full version, including alpha/beta/rc tags. -release = "1.5.5" +release = "1.5.6" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index b6413daba..e6641f76a 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ def open_requirements(path): setuptools.setup( name="strax", - version="1.5.5", + version="1.5.6", description="Streaming analysis for xenon TPCs", author="strax developers", url="https://github.com/AxFoundation/strax", diff --git a/strax/__init__.py b/strax/__init__.py index 0bce01266..24a301121 100644 --- a/strax/__init__.py +++ b/strax/__init__.py @@ -1,5 +1,5 @@ # flake8: noqa -__version__ = "1.5.5" +__version__ = "1.5.6" # Glue the package together # See https://www.youtube.com/watch?v=0oTh1CXRaQ0 if this confuses you From fe1e962bb772051ba0b94711e351ce6596f4132b Mon Sep 17 00:00:00 2001 From: dachengx Date: Mon, 15 Jan 2024 02:21:23 -0600 Subject: [PATCH 3/7] Use trusted publisher --- .github/workflows/pypi_install.yml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/pypi_install.yml b/.github/workflows/pypi_install.yml index 600332333..e02f5e816 100644 --- a/.github/workflows/pypi_install.yml +++ b/.github/workflows/pypi_install.yml @@ -1,31 +1,32 @@ # Pipy upload strax after a release (or manually). # Mostly based on https://github.com/marketplace/actions/pypi-publish -name: Pipy +name: PyPI on: workflow_dispatch: release: - types: [created] + types: [ created ] + jobs: build: runs-on: ubuntu-latest + permissions: + id-token: write steps: # Setup steps - name: Setup python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: - python-version: '3.8' + python-version: '3.9' + - name: Checkout repo - uses: actions/checkout@v4 + uses: actions/checkout@v3 + - name: Install dependencies run: pip install wheel + - name: Build package run: python setup.py sdist bdist_wheel - # Do the publish + - name: Publish a Python distribution to PyPI - # Might want to add but does not work on workflow_dispatch : - # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') - uses: pypa/gh-action-pypi-publish@master - with: - user: ${{ secrets.pipy_token }} - password: ${{ secrets.pypi_password }} + uses: pypa/gh-action-pypi-publish@release/v1 From 893ce0df7ce01c1cd8c23cac7a5c7f2a814b6535 Mon Sep 17 00:00:00 2001 From: dachengx Date: Tue, 16 Jan 2024 05:54:59 -0600 Subject: [PATCH 4/7] Set back pypi --- .github/workflows/pypi_install.yml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/pypi_install.yml b/.github/workflows/pypi_install.yml index e02f5e816..4f62bd754 100644 --- a/.github/workflows/pypi_install.yml +++ b/.github/workflows/pypi_install.yml @@ -1,32 +1,31 @@ # Pipy upload strax after a release (or manually). # Mostly based on https://github.com/marketplace/actions/pypi-publish -name: PyPI +name: Pipy on: workflow_dispatch: release: - types: [ created ] - + types: [created] jobs: build: runs-on: ubuntu-latest - permissions: - id-token: write steps: # Setup steps - name: Setup python uses: actions/setup-python@v5 with: - python-version: '3.9' - + python-version: '3.8' - name: Checkout repo - uses: actions/checkout@v3 - + uses: actions/checkout@v4 - name: Install dependencies run: pip install wheel - - name: Build package run: python setup.py sdist bdist_wheel - + # Do the publish - name: Publish a Python distribution to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 + # Might want to add but does not work on workflow_dispatch : + # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') + uses: pypa/gh-action-pypi-publish@master + with: + user: ${{ secrets.pipy_token }} + password: ${{ secrets.pypi_password }} From 7f8121731ea52163a5a391558abb679cbd33e9e0 Mon Sep 17 00:00:00 2001 From: dachengx Date: Tue, 16 Jan 2024 06:21:00 -0600 Subject: [PATCH 5/7] Drop py3.8 --- .github/workflows/pypi_install.yml | 2 +- .github/workflows/pytest.yml | 4 ++-- .github/workflows/test_install.yml | 2 +- .readthedocs.yml | 2 +- setup.py | 1 - 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pypi_install.yml b/.github/workflows/pypi_install.yml index 4f62bd754..e8f2906d8 100644 --- a/.github/workflows/pypi_install.yml +++ b/.github/workflows/pypi_install.yml @@ -14,7 +14,7 @@ jobs: - name: Setup python uses: actions/setup-python@v5 with: - python-version: '3.8' + python-version: '3.9' - name: Checkout repo uses: actions/checkout@v4 - name: Install dependencies diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index a547a10fe..0404a49eb 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -21,11 +21,11 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.8, 3.9, "3.10"] + python-version: [3.9, "3.10"] test: ['coveralls', 'pytest'] # Installation on py3.10 is rather slow at the moment exclude: - - python-version: "3.10" + - python-version: "3.11" test: coveralls steps: - name: Checkout repo diff --git a/.github/workflows/test_install.yml b/.github/workflows/test_install.yml index 8989ca0be..b634a4554 100644 --- a/.github/workflows/test_install.yml +++ b/.github/workflows/test_install.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.8, 3.9, "3.10"] + python-version: [3.9, "3.10"] steps: - name: Setup python uses: actions/setup-python@v5 diff --git a/.readthedocs.yml b/.readthedocs.yml index e8b37f3b8..52e0ad304 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -11,7 +11,7 @@ build: apt_packages: - graphviz tools: - python: "3.8" + python: "3.9" python: install: diff --git a/setup.py b/setup.py index e6641f76a..2cdbda74a 100644 --- a/setup.py +++ b/setup.py @@ -42,7 +42,6 @@ def open_requirements(path): "Development Status :: 5 - Production/Stable", "License :: OSI Approved :: BSD License", "Natural Language :: English", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Intended Audience :: Science/Research", From 7d54e660df67585aa17836177a105d7fa5988e99 Mon Sep 17 00:00:00 2001 From: dachengx Date: Tue, 16 Jan 2024 06:25:52 -0600 Subject: [PATCH 6/7] =?UTF-8?q?Bump=20version:=201.5.6=20=E2=86=92=201.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- docs/source/conf.py | 4 ++-- setup.py | 2 +- strax/__init__.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index e32b0ad8a..1d6617e6a 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.5.6 +current_version = 1.6.0 files = setup.py strax/__init__.py docs/source/conf.py commit = True tag = True diff --git a/docs/source/conf.py b/docs/source/conf.py index dcb615d0c..5faf89d91 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -66,9 +66,9 @@ # built documents. # # The short X.Y version. -version = "1.5.6" +version = "1.6.0" # The full version, including alpha/beta/rc tags. -release = "1.5.6" +release = "1.6.0" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index 2cdbda74a..0a515239f 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ def open_requirements(path): setuptools.setup( name="strax", - version="1.5.6", + version="1.6.0", description="Streaming analysis for xenon TPCs", author="strax developers", url="https://github.com/AxFoundation/strax", diff --git a/strax/__init__.py b/strax/__init__.py index 24a301121..0723c3814 100644 --- a/strax/__init__.py +++ b/strax/__init__.py @@ -1,5 +1,5 @@ # flake8: noqa -__version__ = "1.5.6" +__version__ = "1.6.0" # Glue the package together # See https://www.youtube.com/watch?v=0oTh1CXRaQ0 if this confuses you From dda2f26c74c9baa7665edf7ad2abaf43cd74711b Mon Sep 17 00:00:00 2001 From: dachengx Date: Tue, 16 Jan 2024 06:26:47 -0600 Subject: [PATCH 7/7] Update HISTORY --- HISTORY.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index 09ecd0ad3..c47f923f8 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,4 +1,4 @@ -1.5.6 / 2024-01-15 +1.6.0 / 2024-01-15 --------------------- * `np.float` is deprecated by @dachengx in https://github.com/AxFoundation/strax/pull/789 * Update pymongo and solve the error of pytest by @dachengx in https://github.com/AxFoundation/strax/pull/791