From 2d4ed5efd09ff786d6f71d2cbfcdaf9d5543aa12 Mon Sep 17 00:00:00 2001 From: Ermano Arruda Date: Tue, 12 Nov 2024 11:06:10 +0000 Subject: [PATCH 1/5] enabling workflow_dispatch --- .github/workflows/build_and_test.yaml | 2 ++ .github/workflows/py_ci.yaml | 1 + 2 files changed, 3 insertions(+) diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index eaf6b5f..de08240 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -4,6 +4,8 @@ on: branches: [main] pull_request: branches: [main] + workflow_dispatch: + jobs: CI: runs-on: ubuntu-latest diff --git a/.github/workflows/py_ci.yaml b/.github/workflows/py_ci.yaml index 063efda..df9acaa 100644 --- a/.github/workflows/py_ci.yaml +++ b/.github/workflows/py_ci.yaml @@ -8,6 +8,7 @@ on: branches: ["main"] pull_request: branches: ["main"] + workflow_dispatch: permissions: contents: read From 210d865c327d1560506a22a7227bce112d89b756 Mon Sep 17 00:00:00 2001 From: Ermano Arruda Date: Tue, 12 Nov 2024 12:41:03 +0000 Subject: [PATCH 2/5] updating bullet version (#1) * updating bullet version * using numpy version compatible with pybullet 3.2.6 --- .github/workflows/py_ci.yaml | 4 ++-- requirements.txt | 4 ++-- requirements_dev.txt | 4 ++-- setup.py | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/py_ci.yaml b/.github/workflows/py_ci.yaml index df9acaa..713f6ad 100644 --- a/.github/workflows/py_ci.yaml +++ b/.github/workflows/py_ci.yaml @@ -30,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 diff --git a/requirements.txt b/requirements.txt index 0dadd00..b746590 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -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 diff --git a/requirements_dev.txt b/requirements_dev.txt index 4dd1c20..fdf46bf 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,6 +1,6 @@ -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 diff --git a/setup.py b/setup.py index 53896b7..9339fb0 100644 --- a/setup.py +++ b/setup.py @@ -35,9 +35,9 @@ 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", @@ -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={ From 03e20a2bfd4f5f58f2f53cb732e8a152d1f7f5a8 Mon Sep 17 00:00:00 2001 From: Ermano Arruda Date: Tue, 12 Nov 2024 12:49:18 +0000 Subject: [PATCH 3/5] bumping version --- package.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.xml b/package.xml index ab0abde..d2d8d34 100644 --- a/package.xml +++ b/package.xml @@ -1,12 +1,12 @@ grip - 0.0.5 + 0.0.6 grip is a library for Robot Grasp Learning Environments. - Ermano Arruda + Ermano Arruda MIT - https://github.com/dyson-ai/grip + https://github.com/eaa3/grip.git rclpy From 8fe98cee92c4099a4790b830250d6c8867638a96 Mon Sep 17 00:00:00 2001 From: Ermano Arruda Date: Tue, 12 Nov 2024 13:47:28 +0000 Subject: [PATCH 4/5] v0.0.7 --- grip/version.py | 2 +- package.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/grip/version.py b/grip/version.py index b1a19e3..6526deb 100644 --- a/grip/version.py +++ b/grip/version.py @@ -1 +1 @@ -__version__ = "0.0.5" +__version__ = "0.0.7" diff --git a/package.xml b/package.xml index d2d8d34..7b10fdd 100644 --- a/package.xml +++ b/package.xml @@ -1,7 +1,7 @@ grip - 0.0.6 + 0.0.7 grip is a library for Robot Grasp Learning Environments. Ermano Arruda MIT From 04d4a89816cc6cd4d5bdbffd67d24e2c46881571 Mon Sep 17 00:00:00 2001 From: Ermano Arruda Date: Thu, 5 Dec 2024 10:24:09 +0000 Subject: [PATCH 5/5] relaxing dependency version on transform3d --- grip/version.py | 2 +- requirements.txt | 2 +- requirements_dev.txt | 2 +- setup.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/grip/version.py b/grip/version.py index 6526deb..a73339b 100644 --- a/grip/version.py +++ b/grip/version.py @@ -1 +1 @@ -__version__ = "0.0.7" +__version__ = "0.0.8" diff --git a/requirements.txt b/requirements.txt index b746590..a72ecd0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,4 +7,4 @@ 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 \ No newline at end of file +transforms3d>=0.4.1 \ No newline at end of file diff --git a/requirements_dev.txt b/requirements_dev.txt index fdf46bf..e343b9a 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -7,7 +7,7 @@ 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 diff --git a/setup.py b/setup.py index 9339fb0..40affd9 100644 --- a/setup.py +++ b/setup.py @@ -45,7 +45,7 @@ "pybullet-planning-eaa", "trimesh>=3.9.20", "xatlas>=0.0.7", - "transforms3d==0.4.1", + "transforms3d>=0.4.1", "strenum", ]