Merge pull request #38 from smolvik1/master

Modernize packaging and dependencies

Author: sogunneroed

.github/workflows/cd.yml

@@ -1,7 +1,7 @@
 name: Deploy to PyPi
 on:  
   release:     
-    types: [created]  
+    types: [published]  
 jobs:  
   upload:  
     environment:
@@ -15,20 +15,16 @@ jobs:
     steps:        
       - name: "Check out code"
         uses: actions/checkout@v3
-      
-      - name: "Set up Python"
-        uses: actions/setup-python@v4
-        with:          
-          python-version: 3.9      
-      
-      - name: "Install dependencies"            
-        run: |
-          python3 -m pip install --upgrade pip              
-          python3 -m pip install poetry
 
-      - name: "Build distributions"            
-        run: |              
-          poetry build
+      - name: "Set up uv"
+        uses: astral-sh/setup-uv@v3
+        with:
+          python-version: "3.11"
+
+      - name: "Build distributions"
+        run: |
+          uv build
+          uv tool run twine check dist/*
           
       - name: "Publish package distributions to PyPI"
         uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/ci.yml

@@ -21,23 +21,19 @@ jobs:
     steps:
       - name: "Check out code"
         uses: actions/checkout@v3
-      
-      - name: "Set up Python"
-        uses: actions/setup-python@v4
-        with:          
-          python-version: 3.9
-      
-      - name: "Installs dependencies"            
-        run: |
-          python -m pip install --upgrade pip              
-          python -m pip install poetry twine
-      
+
+      - name: "Set up uv"
+        uses: astral-sh/setup-uv@v3
+        with:
+          python-version: "3.11"
+
       - name: "Build distribution"
         run: |
-          poetry build
-          twine check dist/*
+          uv build
+          uv tool run twine check dist/*
           
       - name: "Publish package distributions to PyPI Test"
+        if: github.event_name != 'pull_request'
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           repository-url: https://test.pypi.org/legacy/

.gitignore

@@ -10,4 +10,8 @@ sdist/
 .vscode/
 
 # pytest
-.pytest*/
+.pytest*/
+
+# Environment
+.venv/
+venv/

changelog.md

@@ -1,3 +1,8 @@
+## 1.153
+* Switched packaging and dependency management from Poetry to uv
+* Updated CI/CD pipelines to use Python 3.11 and uv
+* Expanded supported Python versions from 3.9 through 3.13
+
 ## 1.152
 * Added automatic versioning information from pyproject.toml
 

openserver/openserver.py

@@ -1,11 +1,12 @@
 import win32com.client
 import numpy as np
 import pythoncom
+from typing import Any
 
 class OpenServer:
     def __init__(self):
         self.status = "Disconnected"
-        self.server = None
+        self.server: Any = None
 
     def __enter__(self): 
         """
@@ -35,7 +36,7 @@ def connect(self, com='PX32.OpenServer.1'):
         try:
             self.server = win32com.client.Dispatch(com)
             self.status = "Connected"
-            return print("OpenServer is connected")
+            print("OpenServer is connected")
         except pythoncom.com_error:
             raise ConnectionError("Unable to establish a connection") from None
 
@@ -45,7 +46,7 @@ def disconnect(self):
         """
         self.server = None
         self.status = "Disconnected"
-        return print("OpenServer has been disconnected")
+        print("OpenServer has been disconnected")
 
     def DoCmd(self, Cmd):
         """
@@ -125,9 +126,12 @@ def DoGet(self, Gv):
                 value = int(value)
             elif '|' in value:  # Checking if | in string is returned
                 if any(x in Gv for x in (',', '[$]', '@', ':')):
-                    num_array = np.fromstring(value[0:-1], sep="|", dtype=float)
                     str_array = np.array(value[0:-1].split('|'))
-                    if num_array.size == str_array.size:  
+                    try:
+                        num_array = str_array.astype(float)
+                    except ValueError:
+                        num_array = np.array([])
+                    if num_array.size == str_array.size:
                         value = num_array  # Return numeric array
                     else:
                         value = str_array  # Return an array of strings

poetry.lock

@@ -1,19 +1,25 @@
-[tool.poetry]
+[project]
 name = "openserver"
-version = "1.152"
+version = "1.153"
 description = "Petroleum Experts OpenServer calculations"
-authors = ["Stian Molvik <stimo@equinor.com>"]
-license = "GNU GPL"
+authors = [{ name = "Stian Molvik", email = "stimo@equinor.com" }]
+license = { text = "GNU GPL" }
 readme = "README.md"
+requires-python = ">=3.9,<3.14"
+dependencies = [
+    "pywin32>=307",
+    "numpy>=1.26.1; python_version < '3.13'",
+    "numpy>=2.1; python_version >= '3.13'",
+]
 
-[tool.poetry.dependencies]
-python = ">=3.9,<3.13"
-pywin32 = "^306"
-numpy = "^1.26.1"
-
-[tool.poetry.group.dev.dependencies]
-pytest = "^7.4.3"
+[dependency-groups]
+dev = [
+    "pytest>=7.4.3,<8",
+]
 
 [build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.hatch.build.targets.wheel]
+packages = ["openserver"]