Skip to content

Commit

Permalink
Merge pull request #4 from traversaro/fixnumpy124
Browse files Browse the repository at this point in the history
Fix compatibility with numpy 1.24
  • Loading branch information
traversaro authored Feb 14, 2023
2 parents 9cff805 + 8ae4ca4 commit 34b3ac7
Show file tree
Hide file tree
Showing 8 changed files with 107 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ channel_targets:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
numpy:
- '1.19'
- '1.21'
5 changes: 3 additions & 2 deletions .circleci/config.yml

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

13 changes: 10 additions & 3 deletions .scripts/build_steps.sh

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

30 changes: 22 additions & 8 deletions LICENSE.txt

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

39 changes: 33 additions & 6 deletions README.md

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

19 changes: 13 additions & 6 deletions build-locally.py

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

22 changes: 22 additions & 0 deletions recipe/24.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/urdfpy/urdf.py b/urdfpy/urdf.py
index 14b0216..b5245e7 100644
--- a/urdfpy/urdf.py
+++ b/urdfpy/urdf.py
@@ -895,7 +895,7 @@ def color(self):
@color.setter
def color(self, value):
if value is not None:
- value = np.asanyarray(value).astype(np.float)
+ value = np.asanyarray(value).astype(np.float64)
value = np.clip(value, 0.0, 1.0)
if value.shape != (4,):
raise ValueError('Color must be a (4,) float')
@@ -2344,7 +2344,7 @@ def get_child_pose(self, cfg=None):
raise ValueError('Invalid configuration')

def get_child_poses(self, cfg, n_cfgs):
- """Computes the child pose relative to a parent pose for a given set of
+ """Computes the child pose relative to a parent pose for a given set of
configuration values.

Parameters
4 changes: 3 additions & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ source:
patches:
- relax_pycollada_req.patch
- unpin_networkx.patch
# Fix compatibility with numpy 1.24
- 24.patch

build:
number: 1
number: 2
noarch: python
script: {{ PYTHON }} -m pip install . -vv

Expand Down

0 comments on commit 34b3ac7

Please sign in to comment.