From 39766ffac6f6052ac8e110f5716c35a139a715d1 Mon Sep 17 00:00:00 2001
From: Xiretza <xiretza@xiretza.xyz>
Date: Sat, 21 May 2022 08:38:21 +0200
Subject: [PATCH] fix: use normal python build workflow instead of in-tree
 builds

---
 .github/workflows/Pipeline.yml             | 8 +-------
 .gitignore                                 | 4 +++-
 f4pga/requirements.txt => requirements.txt | 0
 f4pga/setup.py => setup.py                 | 1 -
 4 files changed, 4 insertions(+), 9 deletions(-)
 rename f4pga/requirements.txt => requirements.txt (100%)
 rename f4pga/setup.py => setup.py (98%)

diff --git a/.github/workflows/Pipeline.yml b/.github/workflows/Pipeline.yml
index e4bc0a3c2..79d736fd3 100644
--- 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
index 8310e6d86..38195744f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 *.pyc
 *.sw*
-/f4pga/build/
+/build
+/dist
+/*.egg-info
diff --git a/f4pga/requirements.txt b/requirements.txt
similarity index 100%
rename from f4pga/requirements.txt
rename to requirements.txt
diff --git a/f4pga/setup.py b/setup.py
similarity index 98%
rename from f4pga/setup.py
rename to setup.py
index 320dceb1d..710f63766 100644
--- a/f4pga/setup.py
+++ b/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']