Skip to content

Commit

Permalink
Merge pull request #1 from eaa3/feature/loosen_dep_version
Browse files Browse the repository at this point in the history
Feature/loosen dep version
  • Loading branch information
eaa3 authored Dec 5, 2024
2 parents 264f0ee + 04d4a89 commit 503ccd4
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 17 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/build_and_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ on:
branches: [main]
pull_request:
branches: [main]
workflow_dispatch:

jobs:
CI:
runs-on: ubuntu-latest
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/py_ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
branches: ["main"]
pull_request:
branches: ["main"]
workflow_dispatch:

permissions:
contents: read
Expand All @@ -29,10 +30,10 @@ jobs:
needs: [black]
steps:
- uses: actions/checkout@v3
- name: Set up Python 3.10
- name: Set up Python 3.10.12
uses: actions/setup-python@v3
with:
python-version: "3.10"
python-version: "3.10.12"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
2 changes: 1 addition & 1 deletion grip/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.0.5"
__version__ = "0.0.8"
6 changes: 3 additions & 3 deletions package.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<package format="3">
<name>grip</name>
<version>0.0.5</version>
<version>0.0.7</version>
<description>grip is a library for Robot Grasp Learning Environments.</description>
<maintainer email="ermano.arruda@dyson.com">Ermano Arruda</maintainer>
<maintainer email="ermano.arruda@gmail.com">Ermano Arruda</maintainer>
<license>MIT</license>

<url type="repository">https://github.com/dyson-ai/grip</url>
<url type="repository">https://github.com/eaa3/grip.git</url>

<exec_depend>rclpy</exec_depend>

Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
numpy>=1.25.2 # numerical computing library
numpy>=1.25.2,<=1.26.4 # numerical computing library
scipy>=1.11.1 # scientific computation tools
pybullet>=3.2.4 # physics engine used for simulation
pybullet>=3.2.6 # physics engine used for simulation
open3d>=0.10.0 # point cloud processing tools
opencv-python>=4.9.0.80 # computer vision tools
matplotlib>=3.3.4 # plotting tools
pybullet-planning-eaa # pure python motion planning
trimesh==3.9.20 # mesh processing tools
xatlas==0.0.7 # mesh parametrisation
transforms3d==0.4.1
transforms3d>=0.4.1
6 changes: 3 additions & 3 deletions requirements_dev.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
numpy>=1.25.2 # numerical computing library
numpy>=1.25.2,<=1.26.4 # numerical computing library
scipy>=1.11.1 # scientific computation tools
pybullet>=3.2.4 # physics engine used for simulation
pybullet>=3.2.6 # physics engine used for simulation
open3d>=0.10.0 # point cloud processing tools
# opencv-python>=4.9.0.80 # computer vision tools
matplotlib>=3.3.4 # plotting tools
pybullet-planning-eaa # pure python motion planning
trimesh==3.9.20 # mesh processing tools
xatlas==0.0.7 # mesh parametrisation
transforms3d==0.4.1
transforms3d>=0.4.1
wheel
pytest
ipdb
Expand Down
10 changes: 5 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@

core_requirements = [
"setuptools<=65",
"numpy>=1.25.2",
"numpy>=1.25.2,<=1.26.4",
"scipy>=1.11.1",
"pybullet>=3.2.4",
"pybullet>=3.2.6",
"open3d>=0.10.0",
"opencv-python>=4.9.0.80",
"matplotlib>=3.3.4",
# "ghalton==0.6.1",
"pybullet-planning-eaa",
"trimesh>=3.9.20",
"xatlas>=0.0.7",
"transforms3d==0.4.1",
"transforms3d>=0.4.1",
"strenum",
]

Expand All @@ -54,10 +54,10 @@
version=__version__,
description="Grip is a prototyping toolbox for manipulation research.",
long_description=open("README.md").read(),
url="https://github.com/dyson-ai/grip",
url="https://github.com/eaa3/grip.git",
author="Ermano Arruda",
maintainer="Ermano Arruda",
maintainer_email="ermano.arruda@dyson.com",
maintainer_email="ermano.arruda@gmail.com",
license="MIT",
install_requires=core_requirements,
extras_require={
Expand Down

0 comments on commit 503ccd4

Please sign in to comment.