Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unpin networkx #3

Merged
merged 3 commits into from
Mar 18, 2022
Merged

Unpin networkx #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d10de4a
Unpin networkx
traversaro Mar 18, 2022
aa3bbbf
Create unpin_networkx.patch
traversaro Mar 18, 2022
1f033c9
MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.18.0, and co…
Mar 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .ci_support/README
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .gitattributes
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions .scripts/build_steps.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .scripts/run_docker_build.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion LICENSE.txt
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 4 additions & 7 deletions build-locally.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -32,7 +33,7 @@ requirements:
- trimesh
run:
- lxml
- networkx ==2.2
- networkx >=2.2
- numpy
- pillow
- pycollada
Expand Down
22 changes: 22 additions & 0 deletions recipe/unpin_networkx.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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