NLWPY: move setup.py and pyproject.toml up #30

ampl · Feb 21, 2024 · 3ce510b · 3ce510b
1 parent cb5097b
commit 3ce510b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
@@ -25,7 +25,7 @@ jobs:
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.16.5
         with:
-          package-dir: nl-writer2/nlwpy/
+          package-dir: nl-writer2/
         env:
           CIBW_ARCHS_LINUX: ${{ env.CIBW_ARCHS_LINUX }}
           CIBW_ARCHS_MACOS: ${{ env.CIBW_ARCHS_MACOS }}
@@ -57,7 +57,7 @@ jobs:
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.16.5
         with:
-          package-dir: nl-writer2/nlwpy/
+          package-dir: nl-writer2/
         env:
           CIBW_ARCHS_LINUX: ${{ matrix.arch }}
           CIBW_ARCHS_MACOS: ${{ env.CIBW_ARCHS_MACOS }}

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -14,9 +14,9 @@ stages:
       - task: UsePythonVersion@0
       - bash: |
           set -ex
-          cd nl-writer2/nlwpy/
+          cd nl-writer2/
           python -m pip install --upgrade cibuildwheel==2.16.2
-          cibuildwheel --platform linux --output-dir wheelhouse .
+          cibuildwheel --platform linux --output-dir nlwpy/wheelhouse .
         displayName: Build wheels
       - task: PublishBuildArtifacts@1
         inputs: {pathtoPublish: 'nl-writer2/nlwpy/wheelhouse'}
@@ -26,9 +26,9 @@ stages:
       - task: UsePythonVersion@0
       - bash: |
           set -ex
-          cd nl-writer2/nlwpy/
+          cd nl-writer2/
           python -m pip install --upgrade cibuildwheel==2.16.2
-          cibuildwheel --platform macos --output-dir wheelhouse .
+          cibuildwheel --platform macos --output-dir nlwpy/wheelhouse .
         displayName: Build wheels
       - task: PublishBuildArtifacts@1
         inputs: {pathtoPublish: 'nl-writer2/nlwpy/wheelhouse'}
@@ -38,9 +38,9 @@ stages:
       - task: UsePythonVersion@0
       - bash: |
           set -ex
-          cd nl-writer2/nlwpy/
+          cd nl-writer2/
           python -m pip install --upgrade cibuildwheel==2.16.2
-          cibuildwheel --platform windows --output-dir wheelhouse .
+          cibuildwheel --platform windows --output-dir nlwpy/wheelhouse .
         displayName: Build wheels
       - task: PublishBuildArtifacts@1
         inputs: {pathtoPublish: 'nl-writer2/nlwpy/wheelhouse'}
@@ -96,9 +96,9 @@ stages:
         displayName: Configure qemu
       - bash: |
           set -ex
-          cd nl-writer2/nlwpy/
+          cd nl-writer2/
           python -m pip install --upgrade cibuildwheel==2.16.2
-          cibuildwheel --platform linux --output-dir wheelhouse .
+          cibuildwheel --platform linux --output-dir nlwpy/wheelhouse .
         displayName: Build wheels
       - task: PublishBuildArtifacts@1
         inputs: {pathtoPublish: 'nl-writer2/nlwpy/wheelhouse'}
@@ -120,4 +120,4 @@ stages:
           inputs:
             targetPath: 'artifacts/'
             artifact: 'release'
-            artifactType: 'pipeline'
+            artifactType: 'pipeline'
diff --git a/nl-writer2/nlwpy/pyproject.toml → nl-writer2/pyproject.toml b/nl-writer2/nlwpy/pyproject.toml → nl-writer2/pyproject.toml
diff --git a/nl-writer2/nlwpy/setup.py → nl-writer2/setup.py b/nl-writer2/nlwpy/setup.py → nl-writer2/setup.py
@@ -18,9 +18,9 @@
 ext_modules = [
     Extension(
         "nlwpy",
-        ["src/nlw_bindings.cc"] + glob.glob("../src/" + "*.cc"),
+        ["nlwpy/src/nlw_bindings.cc"] + glob.glob("./src/" + "*.cc"),
         extra_compile_args=["-std=c++17"],
-        include_dirs=["./include", pybind11.get_include()],
+        include_dirs=["include", pybind11.get_include()],
         # Example: passing in the version to the compiled code
         define_macros=[("VERSION_INFO", __version__)],
     ),