Merge pull request #35 from actinia-org/pypi

PyPI

.flake8

@@ -5,4 +5,4 @@ exclude = .git,__pycache__,env
 # F401 'actinia.actinia.Actinia' imported but unused
 
 per-file-ignores =
-    ./actinia/__init__.py: F401
+    ./src/actinia/__init__.py: F401

.github/workflows/python-publish.yml

@@ -1,46 +1,14 @@
-# This workflow will upload a Python Package using Twine when a release is created
-# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
-
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
 name: Upload Python Package
 
 on:
   release:
     types: [published]
 
 jobs:
-  deploy:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: '3.x'
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install build wheel setuptools
-    - name: Build package
-      run: |
-        python3 setup.py bdist_wheel
-    - name: Release
-      uses: softprops/action-gh-release@v1
-      if: startsWith(github.ref, 'refs/tags/')
-      with:
-        files: dist/*.whl
-
-    - name: Publish package
-      uses: pypa/gh-action-pypi-publish@release/v1
-      with:
-        # repository_url: https://test.pypi.org/legacy/
-        # password: ${{ secrets.TEST_PYPI_API_TOKEN }}
-        password: ${{ secrets.PYPI_API_TOKEN }}
-        packages_dir: dist/
-        verbose: true
+  publish-python:
+    uses: mundialis/github-workflows/.github/workflows/python-publish.yml@python-publish
+    # with:
+    #   test_pypi: true
+    secrets:
+      # PYPI_PASSWORD: ${{ secrets.TEST_PYPI_API_TOKEN }}
+      PYPI_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}

Makefile

@@ -1,25 +1,22 @@
 SRC := .
 
-.PHONY: dependencies
-
-dependencies:
-	pip install -r $(SRC)/requirements.txt
+.PHONY: installdev
 
 install:
 	pip install actinia-python-client
 
-installdev: dependencies
+installdev:
+	pip3 install pip-tools
 	pip install -e .
 
-mockedtest: dependencies
+mockedtest: installdev
 	pip install pytest
 	python -m pytest tests_mocked/
 
-test: dependencies
+test: installdev
 	pip install pytest
 	python -m pytest tests/
 
-devtest:
-	pip install -r $(SRC)/requirements.txt
+devtest: installdev
 	pip install pytest
 	python -m pytest tests/ -m dev

README-dev.md

@@ -7,16 +7,21 @@ source env/bin/activate
 ```
 With `deactivate` you can exit the virtual env
 
+
 ## Install actinia for development
-```
+
+```bash
 make installdev
 ```
+
 Test with Python3:
+
 ```python3
 from actinia import Actinia
 test = Actinia()
 ```
 
+
 ## Run tests
 ```
 docker-compose -f "docker/docker-compose-test.yml" up -d --build

README.md

@@ -7,13 +7,12 @@ Python Client Library for [actinia](https://actinia.mundialis.de/).
 ## Installation
 
 ```bash
-VERSION="0.3.1"
-
-pip3 install "actinia-python-client @ https://github.com/actinia-org/actinia-python-client/releases/download/${VERSION}/actinia_python_client-${VERSION}-py3-none-any.whl"
+pip3 install actinia-python-client
 ```
 
 For newest version see [releases](https://github.com/actinia-org/actinia-python-client/releases).
 
+
 ## Small Example
 
 See [examples](https://actinia-org.github.io/actinia-python-client/03_quickstart)

pyproject.toml

@@ -0,0 +1,34 @@
+[build-system]
+requires = ["setuptools>=61.0"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "actinia-python-client"
+version = "0.3.1"
+authors = [
+  { name="Anika Weinmann", email="[email protected]" },
+]
+maintainers = [{name="mundialis GmbH & Co. KG", email="[email protected]"}]
+description = "Python client library for actinia requests."
+readme = "README.md"
+requires-python = ">=3.8"
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+    "Operating System :: OS Independent",
+]
+dependencies = [
+    "jinja2",
+    "requests",
+    "sphinx-material",
+]
+
+[project.urls]
+"Homepage" = "https://github.com/actinia-org/actinia-python-client"
+"Bug Tracker" = "https://github.com/actinia-org/actinia-python-client/issues"
+
+[tool.setuptools.packages.find]
+where = ["src"]
+
+[tool.setuptools.package-data]
+actinia = ["templates/*.json"]