From 38f9422f4f2bfa8480d5fb32220ed9721ff6e721 Mon Sep 17 00:00:00 2001 From: Erwin Junge Date: Wed, 3 Nov 2021 15:40:41 +0100 Subject: [PATCH 1/4] Update changelog --- CHANGES.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index dac7679a..fd456283 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,16 @@ Changelog ========= +0.2.1 (2021-11-03) +------------------ +* Add tests for python 3.6, 3.7, 3.8, 3.9, pypy +* Add tests for sqlite, mysql, mariadb, postgresql +* Fix bug that broke ``delete_content_blocks`` when using mysql on sqlalchemy 1.3 +* Docs: Add db schema diagram +* Docs: Clarify how to get default data in a default (development) docker instance +* Fix implicit routing in TAXII 1.1 Inboxes +* Update jwt usage to pyjwt >= 2.0 (thanks `@SanyaKapoor `_) + 0.2.0 (2020-06-30) ------------------ * Enforce UTC usage in datetime fields in SQL DB Persistence API. From c1ce594c00986fd60d2c7339686ba15a695e30bf Mon Sep 17 00:00:00 2001 From: Erwin Junge Date: Wed, 3 Nov 2021 15:44:38 +0100 Subject: [PATCH 2/4] Officially add pypy support --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 3aa7e245..969d3dc9 100644 --- a/setup.py +++ b/setup.py @@ -53,6 +53,7 @@ def get_file_contents(filename): 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: Implementation :: PyPy', 'Topic :: Internet', 'Topic :: Security', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', From a7ebe24e921b316dfa3dd80ffc8e7e0022e64172 Mon Sep 17 00:00:00 2001 From: Erwin Junge Date: Wed, 3 Nov 2021 15:45:33 +0100 Subject: [PATCH 3/4] Bump version to 0.2.1 --- opentaxii/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opentaxii/_version.py b/opentaxii/_version.py index 0c68dd23..adf0eb29 100644 --- a/opentaxii/_version.py +++ b/opentaxii/_version.py @@ -3,4 +3,4 @@ This module defines the package version for use in __init__.py and setup.py. """ -__version__ = '0.2.1alpha' +__version__ = '0.2.1' From 7edaca6b23dc4c88ec127de7e711a51431b42ede Mon Sep 17 00:00:00 2001 From: Erwin Junge Date: Thu, 4 Nov 2021 12:47:26 +0100 Subject: [PATCH 4/4] Add github action to publish tagged releases --- .github/workflows/publish.yml | 40 +++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .github/workflows/publish.yml diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 00000000..caefe651 --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,40 @@ +name: Publish to PyPI/github + +on: + push: + tags: + - '[0-9]+.[0-9]+.[0-9]+' + +jobs: + build-n-publish: + name: Build and publish to PyPI + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - name: Set up Python 3.9 + uses: actions/setup-python@v2 + with: + python-version: 3.9 + - name: Install pypa/build + run: >- + python -m + pip install + build + --user + - name: Build a binary wheel and a source tarball + run: >- + python -m + build + --sdist + --wheel + --outdir dist/ + - name: Create github release + uses: ncipollo/release-action@v1 + with: + artifacts: "dist/opentaxii*.whl,dist/opentaxii*.tar.gz" + bodyFile: "CHANGES.rst" + token: ${{ secrets.GITHUB_TOKEN }} + - name: Publish distribution to PyPI + uses: pypa/gh-action-pypi-publish@release/v1 + with: + password: ${{ secrets.PYPI_API_TOKEN }}