Merge pull request #3 from traversaro/unpinnetworkx

Unpin networkx
conda-forge · Mar 18, 2022 · 6c89ff9 · 6c89ff9
2 parents 4837028 + 1f033c9
commit 6c89ff9
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 18 deletions.
diff --git a/.ci_support/README b/.ci_support/README
diff --git a/.gitattributes b/.gitattributes
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/README.md b/README.md
diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -11,16 +11,17 @@ source:
   sha256: 504e7d9f07badb72d4240c9be6dd6bd954b2113f5e5e93f1f30251afd62b9e4f
   patches:
     - relax_pycollada_req.patch
+    - unpin_networkx.patch
 
 build:
-  number: 0
+  number: 1
   noarch: python
   script: {{ PYTHON }} -m pip install . -vv
 
 requirements:
   host:
     - lxml
-    - networkx ==2.2
+    - networkx >=2.2
     - numpy
     - pillow
     - pip
@@ -32,7 +33,7 @@ requirements:
     - trimesh
   run:
     - lxml
-    - networkx ==2.2
+    - networkx >=2.2
     - numpy
     - pillow
     - pycollada

diff --git a/recipe/unpin_networkx.patch b/recipe/unpin_networkx.patch
@@ -0,0 +1,22 @@
+From f64bbde7b0af03f98b5f641ac2059783e3fe3a64 Mon Sep 17 00:00:00 2001
+From: Silvio Traversaro <[email protected]>
+Date: Fri, 18 Mar 2022 23:27:10 +0100
+Subject: [PATCH] Unpin networkx
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index cd8f3b5..252c29a 100644
+--- a/setup.py
++++ b/setup.py
+@@ -5,7 +5,7 @@
+
+ requirements = [
+     'lxml',             # For XML DOM Tree
+-    'networkx==2.2',    # For joint graph
++    'networkx>=2.2',    # For joint graph
+     'numpy',            # Numpy
+     'pillow',           # For texture image loading
+     'pycollada',   # COLLADA (.dae) mesh loa