fix: use normal python build workflow instead of in-tree builds

chipsalliance · May 22, 2022 · 39766ff · 39766ff
1 parent a6f19c0
commit 39766ff
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/.github/workflows/Pipeline.yml b/.github/workflows/Pipeline.yml
@@ -88,9 +88,7 @@ jobs:
         run: |
           . ./.github/scripts/activate.sh
 
-          cd f4pga
-          pip install .
-          cd ..
+          pip install --use-feature=in-tree-build .
 
       - name: 🚧 Test f4pga-env
         run: |
@@ -151,9 +149,7 @@ jobs:
         run: |
           . ./.github/scripts/activate.sh
 
-          cd f4pga
           pip install --use-feature=in-tree-build .
-          cd ..
 
       - name: 🚧 Test f4pga build
         run: |
@@ -206,9 +202,7 @@ jobs:
         run: |
           . ./.github/scripts/activate.sh
 
-          cd f4pga
           pip install --use-feature=in-tree-build .
-          cd ..
 
       - name: 🚦 Test Python wrappers
         run: |

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 *.pyc
 *.sw*
-/f4pga/build/
+/build
+/dist
+/*.egg-info
diff --git a/f4pga/requirements.txt → requirements.txt b/f4pga/requirements.txt → requirements.txt
diff --git a/f4pga/setup.py → setup.py b/f4pga/setup.py → setup.py
@@ -81,7 +81,6 @@ def get_requirements(file: Path) -> List[str]:
         "f4pga.common_modules",
         "f4pga.wrappers.sh"
     ],
-    package_dir={"f4pga": "."},
     package_data={
         'f4pga': ['*.json', 'platforms/*.json'],
         'f4pga.wrappers.sh': ['xc7/*.f4pga.sh', 'quicklogic/*.f4pga.sh']