refactor(lib): from two modules to one

Poetry, and Python is general, is bad at handling monorepos. So we move from two packages to one, that is fully build with maturin. We also now use PDM instead of Poetry.
jeertmans · Jan 4, 2024 · 6928581 · 6928581
1 parent b6dfd8d
commit 6928581
Show file tree

Hide file tree

Showing 58 changed files with 4,282 additions and 4,879 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -10,28 +10,21 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
 
-    - name: Install Poetry
-      run: pipx install poetry
-
-    - name: Build DiffeRT-core
-      uses: PyO3/maturin-action@v1
+    - name: Install PDM
+      uses: pdm-project/setup-pdm@v3
       with:
-        command: build
-        working-directory: differt-core
-        sccache: true
+        python-version: '3.11'
+        cache: true
 
-    - name: Install Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.10'
-        cache: poetry
+    - name: Install Rust
+      uses: dtolnay/rust-toolchain@stable
 
-    - name: Install Differt
+    - name: Install dependencies
       run: |
-        poetry install --with test
+        pdm install -G test,github-action
 
     - name: Run pytest and coverage
-      run: poetry run pytest --cov-report xml --cov=differt tests/
+      run: pdm run pytest --cov-report xml --cov=differt tests/
 
     - name: Upload to codecov.io
       uses: codecov/codecov-action@v3

diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
@@ -34,32 +34,25 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
 
-    - name: Install Poetry
-      run: pipx install poetry
-
-    - name: Install Python
-      uses: actions/setup-python@v4
+    - name: Install PDM
+      uses: pdm-project/setup-pdm@v3
       with:
-        python-version: '3.10'
-        cache: poetry
+        python-version: '3.11'
+        cache: true
 
-    - name: Build DiffeRT-core
-      uses: PyO3/maturin-action@v1
-      with:
-        command: build
-        working-directory: differt-core
-        sccache: true
+    - name: Install Rust
+      uses: dtolnay/rust-toolchain@stable
 
-    - name: Install Differt
+    - name: Install dependencies
       run: |
-        poetry install --with docs,github-action
+        pdm install -G docs,github-action
 
     - name: Add Jupyter Kernel
       run: |
-        poetry run python -m ipykernel install --user --name DiffeRT
+        pdm run python -m ipykernel install --user --name DiffeRT
 
     - name: Build docs
-      run: cd docs && poetry run make html
+      run: cd docs && pdm run make html
 
     - name: Upload artifact
       if: github.event_name != 'pull_request'

diff --git a/.github/workflows/publish_differt_core.yml → .github/workflows/publish.yml b/.github/workflows/publish_differt_core.yml → .github/workflows/publish.yml
@@ -1,5 +1,4 @@
-name: Publish differt-core Python Package
-
+name: Publish Python Package
 on:
   push:
     branches:
@@ -11,10 +10,6 @@ on:
 permissions:
   contents: read
 
-defaults:
-  run:
-    working-directory: differt-core
-
 jobs:
   linux:
     runs-on: ubuntu-latest
@@ -23,7 +18,7 @@ jobs:
         target: [x86_64, x86, aarch64, armv7, s390x, ppc64le]
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Install Python
       uses: actions/setup-python@v4
@@ -33,7 +28,6 @@ jobs:
     - name: Build wheels
       uses: PyO3/maturin-action@v1
       with:
-        working-directory: differt-core
         target: ${{ matrix.target }}
         args: --release --out dist --find-interpreter
         sccache: 'true'
@@ -43,7 +37,7 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
         name: wheels
-        path: differt-core/dist
+        path: dist
 
   windows:
     runs-on: windows-latest
@@ -52,7 +46,7 @@ jobs:
         target: [x64, x86]
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Install Python
       uses: actions/setup-python@v4
@@ -63,7 +57,6 @@ jobs:
     - name: Build wheels
       uses: PyO3/maturin-action@v1
       with:
-        working-directory: differt-core
         target: ${{ matrix.target }}
         args: --release --out dist --find-interpreter
         sccache: 'true'
@@ -72,7 +65,7 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
         name: wheels
-        path: differt-core/dist
+        path: dist
 
   macos:
     runs-on: macos-latest
@@ -81,7 +74,7 @@ jobs:
         target: [x86_64, aarch64]
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Install Python
       uses: actions/setup-python@v4
@@ -91,7 +84,6 @@ jobs:
     - name: Build wheels
       uses: PyO3/maturin-action@v1
       with:
-        working-directory: differt-core
         target: ${{ matrix.target }}
         args: --release --out dist --find-interpreter
         sccache: 'true'
@@ -100,26 +92,25 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
         name: wheels
-        path: differt-core/dist
+        path: dist
 
   sdist:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Build sdist
       uses: PyO3/maturin-action@v1
       with:
         command: sdist
-        working-directory: differt-core
         args: --out dist
 
     - name: Upload sdist
       uses: actions/upload-artifact@v3
       with:
         name: wheels
-        path: differt-core/dist
+        path: dist
 
   release:
     name: Release

diff --git a/.github/workflows/publish_differt.yml b/.github/workflows/publish_differt.yml