From 86ea363cbebfc094ae009588c02529d1430076c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janko=20Slavi=C4=8D?= Date: Tue, 14 Nov 2023 07:12:00 +0100 Subject: [PATCH 1/5] preparing actions --- .../workflows/release-and-publish-to-pypi.yml | 44 +++++++++++++++++++ .../{python-package.yaml => testing.yaml} | 0 2 files changed, 44 insertions(+) create mode 100644 .github/workflows/release-and-publish-to-pypi.yml rename .github/workflows/{python-package.yaml => testing.yaml} (100%) diff --git a/.github/workflows/release-and-publish-to-pypi.yml b/.github/workflows/release-and-publish-to-pypi.yml new file mode 100644 index 0000000..b289438 --- /dev/null +++ b/.github/workflows/release-and-publish-to-pypi.yml @@ -0,0 +1,44 @@ +name: Release and Publish to PyPI +on: + push: + tags: + - 'v*' +jobs: + release: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Create GitHub Release + id: create_release + uses: actions/create-release@v1 + with: + tag_name: ${{ github.ref }} + release_name: Release ${{ github.ref }} + draft: false + prerelease: false + + publish: + runs-on: ubuntu-latest + needs: release + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: '3.11' + + - name: Install dependencies + run: pip install setuptools wheel twine build + + - name: Build package + run: python -m build + + - name: Publish to PyPI + uses: pypa/gh-action-pypi-publish@v1.4.2 + with: + user: __token__ + password: ${{ secrets.PYPI_API_TOKEN }} diff --git a/.github/workflows/python-package.yaml b/.github/workflows/testing.yaml similarity index 100% rename from .github/workflows/python-package.yaml rename to .github/workflows/testing.yaml From 040e6b01667737423f8c496f35629bfb6b9259a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janko=20Slavi=C4=8D?= Date: Tue, 14 Nov 2023 07:16:50 +0100 Subject: [PATCH 2/5] prep for v1.0.1 --- LDAQ/__init__.py | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LDAQ/__init__.py b/LDAQ/__init__.py index f45be98..88498b4 100644 --- a/LDAQ/__init__.py +++ b/LDAQ/__init__.py @@ -1,4 +1,4 @@ -__version__ = "1.0.0" +__version__ = "1.0.1" from .utils import * from .core import Core from .visualization import * diff --git a/pyproject.toml b/pyproject.toml index c3dfcaf..e3a01fc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "LDAQ" -version = "1.0.0" +version = "1.0.1" authors = [{name = "Tilen Košir, Klemen Zaletelj, Janko Slavič", email = "janko.slavic@fs.uni-lj.si"}] maintainers = [{name = "Tilen Košir, Klemen Zaletelj", email = "klemen.zaletelj@fs.uni-lj.si"}] license = "MIT" From 82ff426016ae321ac955511a875a535130c069b5 Mon Sep 17 00:00:00 2001 From: klemengit Date: Tue, 14 Nov 2023 08:40:37 +0100 Subject: [PATCH 3/5] readme update and version 1.0.2 --- .github/workflows/release-and-publish-to-pypi.yml | 15 --------------- LDAQ/__init__.py | 2 +- README.rst | 13 +++++++++++++ pyproject.toml | 2 +- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/.github/workflows/release-and-publish-to-pypi.yml b/.github/workflows/release-and-publish-to-pypi.yml index b289438..d431d98 100644 --- a/.github/workflows/release-and-publish-to-pypi.yml +++ b/.github/workflows/release-and-publish-to-pypi.yml @@ -4,21 +4,6 @@ on: tags: - 'v*' jobs: - release: - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v2 - - - name: Create GitHub Release - id: create_release - uses: actions/create-release@v1 - with: - tag_name: ${{ github.ref }} - release_name: Release ${{ github.ref }} - draft: false - prerelease: false - publish: runs-on: ubuntu-latest needs: release diff --git a/LDAQ/__init__.py b/LDAQ/__init__.py index 88498b4..7782750 100644 --- a/LDAQ/__init__.py +++ b/LDAQ/__init__.py @@ -1,4 +1,4 @@ -__version__ = "1.0.1" +__version__ = "1.0.2" from .utils import * from .core import Core from .visualization import * diff --git a/README.rst b/README.rst index 0bed2db..200f6bb 100644 --- a/README.rst +++ b/README.rst @@ -1,3 +1,16 @@ +LDAQ +==== + +Data acquisition and generation with live visualization. + +Installation +============ + +The package can be installed from PyPI using pip: +.. code-block:: + + pip install LDAQ + Getting started =============== diff --git a/pyproject.toml b/pyproject.toml index e3a01fc..403769d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "LDAQ" -version = "1.0.1" +version = "1.0.2" authors = [{name = "Tilen Košir, Klemen Zaletelj, Janko Slavič", email = "janko.slavic@fs.uni-lj.si"}] maintainers = [{name = "Tilen Košir, Klemen Zaletelj", email = "klemen.zaletelj@fs.uni-lj.si"}] license = "MIT" From 986bc37ea51b555c21eb8e4f8cf4ed1c3c387a98 Mon Sep 17 00:00:00 2001 From: klemengit Date: Tue, 14 Nov 2023 08:45:10 +0100 Subject: [PATCH 4/5] bugfixing for github actions, release bump --- .github/workflows/release-and-publish-to-pypi.yml | 1 - LDAQ/__init__.py | 2 +- pyproject.toml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-and-publish-to-pypi.yml b/.github/workflows/release-and-publish-to-pypi.yml index d431d98..804712a 100644 --- a/.github/workflows/release-and-publish-to-pypi.yml +++ b/.github/workflows/release-and-publish-to-pypi.yml @@ -6,7 +6,6 @@ on: jobs: publish: runs-on: ubuntu-latest - needs: release steps: - name: Checkout code uses: actions/checkout@v2 diff --git a/LDAQ/__init__.py b/LDAQ/__init__.py index 7782750..8888830 100644 --- a/LDAQ/__init__.py +++ b/LDAQ/__init__.py @@ -1,4 +1,4 @@ -__version__ = "1.0.2" +__version__ = "1.0.3" from .utils import * from .core import Core from .visualization import * diff --git a/pyproject.toml b/pyproject.toml index 403769d..0941783 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "LDAQ" -version = "1.0.2" +version = "1.0.3" authors = [{name = "Tilen Košir, Klemen Zaletelj, Janko Slavič", email = "janko.slavic@fs.uni-lj.si"}] maintainers = [{name = "Tilen Košir, Klemen Zaletelj", email = "klemen.zaletelj@fs.uni-lj.si"}] license = "MIT" From b84e287b17f0b18256d688d14a33a3c306849b78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janko=20Slavi=C4=8D?= Date: Tue, 14 Nov 2023 14:38:52 +0100 Subject: [PATCH 5/5] just publish, no release --- .../{release-and-publish-to-pypi.yml => publish-to-pypi.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{release-and-publish-to-pypi.yml => publish-to-pypi.yml} (94%) diff --git a/.github/workflows/release-and-publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml similarity index 94% rename from .github/workflows/release-and-publish-to-pypi.yml rename to .github/workflows/publish-to-pypi.yml index 804712a..fcf6bd2 100644 --- a/.github/workflows/release-and-publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -1,4 +1,4 @@ -name: Release and Publish to PyPI +name: Publish to PyPI on: push: tags: