Make use of poetry

.codespellignore

@@ -0,0 +1 @@
+poetry.lock

.github/dependabot.yml

@@ -17,3 +17,13 @@ updates:
           - "*" # Update all packages together
         exclude-patterns:
           - "opentelemetry*"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    groups:
+      github-actions:
+        patterns:
+          - "*"
+

.github/workflows/ci_cd.yml

@@ -39,11 +39,15 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: ${{ env.PYTHON_VERSION }}
+
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip setuptools tox
-      - name: Test with tox
-        run: tox -e style
+          pip install poetry
+          poetry install --all-extras --all-groups
+
+      - name: Run pre-commit
+        run: |
+          poetry run pre-commit run --all-files || ( git status --short ; git diff ; exit 1 )
 
   tests:
     uses: ./.github/workflows/tests.yml
@@ -72,12 +76,11 @@ jobs:
     - name: Install dependencies and build the library
       id: wheels      
       run: |
-        python -m pip install --upgrade pip setuptools
-        python -m pip install -r requirements/requirements_build.txt
-        python build.py dev
-        python build.py wheels
-        python -m twine check dist/*
-        version=$(ls dist/ | grep ansys_hps_data_transfer_client | grep -E -o "[0-9]+.[0-9]+.[0-9]+")
+        pip install poetry
+        poetry install --all-extras --all-groups
+        poetry build
+        poetry run python -m twine check dist/*
+        version=$(ls dist/ | grep whl | grep -E -o "[0-9]+.[0-9]+.[0-9]+")
         echo "version=$version" >> $GITHUB_OUTPUT
         echo "Version: $version"
 

.github/workflows/generate_models.yml

@@ -46,8 +46,8 @@ jobs:
 
       - name: Create venv
         run: |
-            python3 -m venv dev_env
-            dev_env/bin/python build.py dev
+            pip install poetry
+            poetry install --all-extras --all-groups
 
       - name: Generate models
         run: |

.github/workflows/tests.yml

@@ -15,8 +15,9 @@ jobs:
       matrix:
         os: [ubuntu-latest-8-cores]
         cfg:
-          - {python-version: "3.10", toxenv: "py310"}
-          - {python-version: "3.12", toxenv: "py312"}
+          - {python-version: "3.10"}
+          - {python-version: "3.12"}
+          - {python-version: "3.13"}
       fail-fast: false
     steps:
       - uses: actions/checkout@v4
@@ -48,7 +49,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          python build.py dev
+          pip install poetry
+          poetry install --all-extras --all-groups
 
       - name: Start containers
         run: |
@@ -57,7 +59,7 @@ jobs:
 
       - name: Run tests
         run: |
-          python build.py tests
+          poetry run pytest .
 
       - name: Stop containers
         if: always()

.pre-commit-config.yaml

@@ -38,13 +38,14 @@ repos:
   rev: v2.1.0
   hooks:
   - id: codespell
-    # exclude: >
-    #   (?x)^(
-    #       .*\.dat|
-    #       .*\.mac|
-    #       .*\.k
-    #   )$
-    # args: [-I, .codespellignore, --ignore-long-lines]
+    exclude: >
+      (?x)^(
+          .*\.dat|
+          .*\.mac|
+          .*\.lock|
+          .*\.k
+      )$
+    #args: [-I, .codespellignore]
 
 # For now we disable some of these checks, can be reenabled later
 # - repo: https://github.com/pycqa/pydocstyle

README.md

@@ -3,35 +3,25 @@ Python client library for HPS Data Transfer Service
 
 ### Prerequisites
 
-Install pre-commit in your `global` python using
+Install poetry globally
 
 ```
-python -m pip install pre-commit
+python -m pip install poetry
 ```
 ### Setup Environment
 
-#### Linux:
-
-```
-python3 -m venv dev_env
-source dev_env/bin/activate
-python build.py dev
-```
-#### Windows:
 ```    
-python3 -m venv dev_env
-dev_env/Scripts/activate
-python build.py dev
+poetry install --all-groups --all-extras
 ```
 
-### Build
+### Build wheels
 ```    
-python build.py dist
+poetry build
 ```
 
 ### Test
 ```    
-python build.py tests
+poetry run pytest .
 ```
 
 ### Generate Models

ansys/hps/data_transfer/client/binary.py

@@ -6,6 +6,7 @@
 import threading
 import time
 
+import humanfriendly
 import portend
 
 from .exceptions import BinaryError
@@ -179,6 +180,10 @@ def stop(self, wait=5.0):
         if self._process is None:
             return
 
+        if self._process.poll() is not None:
+            log.debug("Worker already stopped")
+            return
+
         log.debug("Stopping worker ...")
         self._stop.set()
         self._prepared.clear()
@@ -192,6 +197,7 @@ def stop(self, wait=5.0):
                 self._process.kill()
                 break
             time.sleep(wait * 0.1)
+        log.debug(f"Worker stopped after {humanfriendly.format_timespan(time.time() - start)}")
 
     def args_str(self):
         return " ".join(self._args)

ansys/hps/data_transfer/client/client.py

@@ -76,7 +76,7 @@ def mark_ready(self, ready):
                 self._ok_reported = True
         else:
             self._ok_reported = False
-            log.warning(msg)
+            log.info(msg)
 
     def mark_failed(self, exc=None, binary=None):
         exc_str = "" if exc is None else f": {exc}"

generate_models.sh

@@ -6,7 +6,7 @@ docker run --rm -v "${PWD}:/local" openapitools/openapi-generator-cli generate \
     -g openapi \
     -o /local/out --skip-validate-spec
 
-dev_env/bin/datamodel-codegen --input ./out/openapi.json --input-file-type openapi --output ansys/hps/data_transfer/client/models --output-model-type pydantic_v2.BaseModel --custom-file-header "# generated by datamodel-codegen"
+poetry run datamodel-codegen --input ./out/openapi.json --input-file-type openapi --output ansys/hps/data_transfer/client/models --output-model-type pydantic_v2.BaseModel --custom-file-header "# generated by datamodel-codegen"
 
 sed_cmd=sed
 
@@ -26,7 +26,7 @@ popd
 for i in {1..10}
 do
     echo "Running $i iteration"
-    dev_env/bin/pre-commit run --all-files
+    poetry run pre-commit run --all-files
     if [ $? -eq 0 ]
     then
         break