Skip to content

Commit c76a040

Browse files
committed
updating deps and setup.py
1 parent 981ed04 commit c76a040

File tree

4 files changed

+15
-12
lines changed

4 files changed

+15
-12
lines changed

.github/workflows/publish.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ jobs:
66
# Auto-publish when version is increased
77
publish-job:
88
# Only publish on `main` branch
9-
if: github.ref == 'refs/heads/other'
9+
if: github.ref == 'refs/heads/main'
1010
runs-on: ubuntu-latest
11-
permissions: # Don't forget permissions
11+
permissions: # Don't forget permissions
1212
contents: write
1313

1414
steps:
15-
- uses: etils-actions/pypi-auto-publish@v1
16-
with:
17-
pypi-token: ${{ secrets.PYPI_API_TOKEN }}
18-
gh-token: ${{ secrets.GITHUB_TOKEN }}
19-
parse-changelog: true
15+
- uses: etils-actions/pypi-auto-publish@v1
16+
with:
17+
pypi-token: ${{ secrets.PYPI_API_TOKEN }}
18+
gh-token: ${{ secrets.GITHUB_TOKEN }}
19+
parse-changelog: true

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pybullet>=3.2.4 # physics engine used for simulation
44
open3d>=0.10.0 # point cloud processing tools
55
opencv-python>=4.9.0.80 # computer vision tools
66
matplotlib>=3.3.4 # plotting tools
7-
pybullet_planning@git+https://github.com/eaa3/pybullet_planning.git@dev # pure python motion planning
7+
pybullet-planning-eaa # pure python motion planning
88
trimesh==3.9.20 # mesh processing tools
99
xatlas==0.0.7 # mesh parametrisation
1010
transforms3d==0.4.1

requirements_dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pybullet>=3.2.4 # physics engine used for simulation
44
open3d>=0.10.0 # point cloud processing tools
55
# opencv-python>=4.9.0.80 # computer vision tools
66
matplotlib>=3.3.4 # plotting tools
7-
pybullet_planning@git+https://github.com/eaa3/pybullet_planning.git@dev # pure python motion planning
7+
pybullet-planning-eaa # pure python motion planning
88
trimesh==3.9.20 # mesh processing tools
99
xatlas==0.0.7 # mesh parametrisation
1010
transforms3d==0.4.1

setup.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@
3434
need_files.append(fn[1 + len(hh) :])
3535

3636
core_requirements = [
37-
"setuptools>=65.5.1",
37+
"setuptools<=65",
3838
"numpy>=1.25.2",
3939
"scipy>=1.11.1",
4040
"pybullet>=3.2.4",
4141
"open3d>=0.10.0",
4242
"opencv-python>=4.9.0.80",
4343
"matplotlib>=3.3.4",
4444
# "ghalton==0.6.1",
45-
"pybullet_planning@git+https://github.com/eaa3/pybullet_planning.git@dev",
45+
"pybullet-planning-eaa",
4646
"trimesh>=3.9.20",
4747
"xatlas>=0.0.7",
4848
"transforms3d==0.4.1",
@@ -54,7 +54,6 @@
5454
version=__version__,
5555
description="Grip is a prototyping toolbox for manipulation research.",
5656
long_description=open("README.md").read(),
57-
long_description_content_type="text/markdown",
5857
url="https://github.com/dyson-ai/grip",
5958
author="Ermano Arruda",
6059
maintainer="Ermano Arruda",
@@ -96,6 +95,10 @@
9695
share_dir + "/grip_assets/config",
9796
glob.glob(os.path.join("grip_assets/config", "*.yaml")),
9897
),
98+
(
99+
share_dir,
100+
glob.glob("*.md"),
101+
),
99102
],
100103
zip_safe=False,
101104
entry_points={

0 commit comments

Comments
 (0)