From 0896bd19f28beaacbe410cfafad3aca19ab09860 Mon Sep 17 00:00:00 2001 From: Xiretza 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 | 6 ------ .gitignore | 4 +++- f4pga/requirements.txt => requirements.txt | 0 f4pga/setup.py => setup.py | 1 - 4 files changed, 3 insertions(+), 8 deletions(-) rename f4pga/requirements.txt => requirements.txt (100%) rename f4pga/setup.py => setup.py (99%) diff --git a/.github/workflows/Pipeline.yml b/.github/workflows/Pipeline.yml index 522058fb6..c0c89bfbe 100644 --- 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 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 99% rename from f4pga/setup.py rename to setup.py index 21d20d884..dc1157563 100644 --- a/f4pga/setup.py +++ b/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']