Another OM release attempt

.github/workflows/publish.yml

@@ -101,12 +101,11 @@ jobs:
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
-          working-directory: python/origen_metal
           target: x86_64
           manylinux: auto
           # This is required to fix an SSL build error
           before-script-linux: yum install perl-IPC-Cmd -y
-          args: --release --strip --out dist --manifest-path ../../rust/pyapi_metal/Cargo.toml --interpreter python${{ matrix.python-version }}
+          args: --release --strip --out dist --manifest-path rust/pyapi_metal/Cargo.toml --interpreter python${{ matrix.python-version }}
       - name: Install Poetry
         run: |
           pip install poetry==1.3.2

python/origen_metal/pyproject.toml

@@ -1,15 +1,11 @@
 [tool.poetry]
 name = "origen_metal"
-version = "0.4.1-dev2"
+version = "0.4.1-dev3"
 description = "Bare metal APIs for the Origen SDK"
 homepage = "https://origen-sdk.org/o2"
 license = "MIT"
 readme = "README.md"
 authors = ["Origen-SDK"]
-#include = [
-#    "origen_metal/_origen_metal.pyd", # Windows
-#    "origen_metal/_origen_metal.so", # Linux
-#]
 
 [tool.poetry.dependencies]
 python = ">=3.7.0,<3.13"
@@ -32,9 +28,13 @@ markers = [
     "ldap: marks tests requiring/using the external ldap",
 ]
 
-[tool.poetry.build]
-script = "poetry_build.py"
-generate-setup-file = false
+# SMcG - Commented out, breaks regression (setting up test/python_app env)
+#[tool.poetry.build]
+#script = "poetry_build.py"
+#generate-setup-file = false
+
+[tool.maturin]
+module-name = "origen_metal._origen_metal"
 
 # This needs to be present to build for Linux, but does not work
 # for the current Windows build flow

python/origen_metal/setup.py

@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+from setuptools import setup
+
+packages = \
+['origen_metal',
+ 'origen_metal._helpers',
+ 'origen_metal.framework',
+ 'origen_metal.frontend',
+ 'origen_metal.utils',
+ 'origen_metal.utils.revision_control',
+ 'origen_metal.utils.revision_control.supported']
+
+package_data = \
+{'': ['*'], 'origen_metal': ['.pytest_cache/*', '.pytest_cache/v/cache/*']}
+
+install_requires = \
+['colorama>=0.4.4', 'importlib-metadata>=6.7.0', 'termcolor>=1.1.0']
+
+extras_require = \
+{':sys_platform == "win32"': ['pyreadline3>=3.3,<4.0']}
+
+setup_kwargs = {
+    'name': 'origen-metal',
+    'version': '0.4.1.dev2',
+    'description': 'Bare metal APIs for the Origen SDK',
+    'long_description': '',
+    'author': 'Origen-SDK',
+    'author_email': 'None',
+    'maintainer': 'None',
+    'maintainer_email': 'None',
+    'url': 'https://origen-sdk.org/o2',
+    'packages': packages,
+    'package_data': package_data,
+    'install_requires': install_requires,
+    'extras_require': extras_require,
+    'python_requires': '>=3.7.0,<3.13',
+}
+from poetry_build import *
+build(setup_kwargs)
+
+setup(**setup_kwargs)

rust/origen_metal/Cargo.toml

@@ -24,7 +24,7 @@ time = "0.1"
 termcolor = "1"
 regex = "1"
 tempfile = "3"
-pyo3 = {version = "0.19.1", features = ["extension-module"], optional = true}
+pyo3 = {version = "0.19.1", features = ["extension-module", "generate-import-lib"], optional = true}
 serde = {version = "1.0", features = ["derive"]}
 toml = "0.5"
 toml_edit = "0.21.0"

rust/pyapi_metal/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "origen-metal"
-version = "0.4.1-dev2"
+version = "0.4.1-dev3"
 edition = "2021"
 authors = ["Origen-SDK"]
 

rust/pyapi_metal/pyproject.toml

@@ -0,0 +1 @@
+../../python/origen_metal/pyproject.toml