Merge pull request f4pga#1828 from litghost/fix_requirements

Fix pip requirements
mithro · Dec 3, 2020 · 30f32c9 · 30f32c9
2 parents a6eb1c1 + 887cb3e
commit 30f32c9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/environment.yml b/environment.yml
@@ -25,7 +25,3 @@ dependencies:
   - pip
   - pip:
     - -r file:requirements.txt
-    # Ibex dependencies
-    - git+https://github.com/lowRISC/edalize.git@ot
-    - git+https://github.com/lowRISC/fusesoc.git@ot
-    - mako
diff --git a/requirements.txt b/requirements.txt
@@ -19,6 +19,9 @@ textx
 tinyfpgab
 tinyprog
 yapf==0.26.0
+git+https://github.com/SymbiFlow/symbiflow-rr-graph.git#egg=rr-graph
+git+https://github.com/SymbiFlow/python-fpga-interchange.git#egg=python-fpga-interchange
+-e third_party/prjxray
 -e third_party/fasm
 -e third_party/xc-fasm
 -e third_party/python-sdf-timing
@@ -33,3 +36,7 @@ yapf==0.26.0
 -e third_party/migen
 -e third_party/pythondata-cpu-vexriscv
 -e third_party/pythondata-software-compiler_rt
+# Ibex dependencies
+git+https://github.com/lowRISC/edalize.git@ot
+git+https://github.com/lowRISC/fusesoc.git@ot
+mako
diff --git a/third_party/python-symbiflow-v2x b/third_party/python-symbiflow-v2x
diff --git a/third_party/symbiflow-xc-fasm2bels b/third_party/symbiflow-xc-fasm2bels
diff --git a/third_party/xc-fasm b/third_party/xc-fasm