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

chipsalliance · Jul 31, 2022 · 0896bd1 · 0896bd1
1 parent 8c411eb
commit 0896bd1
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/.github/workflows/Pipeline.yml b/.github/workflows/Pipeline.yml
@@ -102,9 +102,7 @@ jobs:
         run: |
           . ./.github/scripts/activate.sh
 
-          cd f4pga
           pip install .
-          cd ..
 
       - name: 🚧 Test f4pga-env
         run: |
@@ -165,9 +163,7 @@ jobs:
         run: |
           . ./.github/scripts/activate.sh
 
-          cd f4pga
           pip install .
-          cd ..
 
       - name: 🚧 Test f4pga build
         run: |
@@ -219,9 +215,7 @@ jobs:
         run: |
           . ./.github/scripts/activate.sh
 
-          cd f4pga
           pip install .
-          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
@@ -90,7 +90,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']