mv conf/common/requirements conf/

Signed-off-by: Unai Martinez-Corral <umartinezcorral@antmicro.com>

Author: umarcor

.github/workflows/Suite.yml

@@ -46,7 +46,7 @@ jobs:
       - name: Generate Matrix
         id: generate
         run: |
-          python3 -m pip install -r conf/common/requirements.txt
+          python3 -m pip install -r conf/requirements.txt
           PYTHONPATH=$(pwd) python3 ./.github/workflows/scripts/generate_job_matrix.py all
 
   # Symbiflow tests

.github/workflows/scripts/install.sh

@@ -40,7 +40,7 @@ echo
 echo "======================================="
 echo "Installing Python packages"
 echo "---------------------------------------"
-python3 -m pip install -r conf/common/requirements.txt
+python3 -m pip install -r conf/requirements.txt
 echo "---------------------------------------"
 
 USE_VIVADO=""

Makefile

@@ -55,7 +55,7 @@ install_symbiflow: | $(CONDA_ENV_PYTHON)
 	# Adapt the environment file from symbiflow-arch-defs
 	test -e env/symbiflow/xc7_env/xc7_environment.yml && \
 		sed -i 's/name: xc7/name: symbiflow-env/g' env/symbiflow/xc7_env/xc7_environment.yml
-	cat conf/common/requirements.txt conf/symbiflow/requirements.txt > env/symbiflow/xc7_env/xc7_requirements.txt
+	cat conf/requirements.txt conf/symbiflow/requirements.txt > env/symbiflow/xc7_env/xc7_requirements.txt
 	@$(IN_CONDA_ENV_BASE) conda env update --name symbiflow-env --file env/symbiflow/xc7_env/xc7_environment.yml
 	# List the actual package versions installed
 	@$(CONDA_ACTIVATE) symbiflow-env && conda list

conf/nextpnr/environment.yml

@@ -19,5 +19,5 @@ dependencies:
   - pip
   - pip:
     # Packages installed from PyPI
-    - -r ../common/requirements.txt
+    - -r ../requirements.txt
     - -r requirements.txt

conf/quicklogic/environment.yml

@@ -13,5 +13,5 @@ dependencies:
   - pip
   # Packages installed from PyPI
   - pip:
-    - -r ../common/requirements.txt
+    - -r ../requirements.txt
     - -r requirements.txt

conf/common/requirements.txt renamed to conf/requirements.txt

@@ -8,5 +8,5 @@ dependencies:
   - python=3.7
   - pip
   - pip:
-    - -r ../common/requirements.txt
+    - -r ../requirements.txt
     - -r requirements.txt

conf/symbiflow/environment.yml

@@ -1,3 +1,3 @@
--r ../conf/common/requirements.txt
+-r ../conf/requirements.txt
 -e ../