Skip to content

Commit

Permalink
updating deps and setup.py
Browse files Browse the repository at this point in the history
  • Loading branch information
eaa3 committed Mar 4, 2024
1 parent 981ed04 commit c76a040
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 12 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ jobs:
# Auto-publish when version is increased
publish-job:
# Only publish on `main` branch
if: github.ref == 'refs/heads/other'
if: github.ref == 'refs/heads/main'
runs-on: ubuntu-latest
permissions: # Don't forget permissions
permissions: # Don't forget permissions
contents: write

steps:
- uses: etils-actions/pypi-auto-publish@v1
with:
pypi-token: ${{ secrets.PYPI_API_TOKEN }}
gh-token: ${{ secrets.GITHUB_TOKEN }}
parse-changelog: true
- uses: etils-actions/pypi-auto-publish@v1
with:
pypi-token: ${{ secrets.PYPI_API_TOKEN }}
gh-token: ${{ secrets.GITHUB_TOKEN }}
parse-changelog: true
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pybullet>=3.2.4 # 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@git+https://github.com/eaa3/pybullet_planning.git@dev # pure python motion planning
pybullet-planning-eaa # pure python motion planning
trimesh==3.9.20 # mesh processing tools
xatlas==0.0.7 # mesh parametrisation
transforms3d==0.4.1
Expand Down
2 changes: 1 addition & 1 deletion requirements_dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pybullet>=3.2.4 # 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@git+https://github.com/eaa3/pybullet_planning.git@dev # pure python motion planning
pybullet-planning-eaa # pure python motion planning
trimesh==3.9.20 # mesh processing tools
xatlas==0.0.7 # mesh parametrisation
transforms3d==0.4.1
Expand Down
9 changes: 6 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@
need_files.append(fn[1 + len(hh) :])

core_requirements = [
"setuptools>=65.5.1",
"setuptools<=65",
"numpy>=1.25.2",
"scipy>=1.11.1",
"pybullet>=3.2.4",
"open3d>=0.10.0",
"opencv-python>=4.9.0.80",
"matplotlib>=3.3.4",
# "ghalton==0.6.1",
"pybullet_planning@git+https://github.com/eaa3/pybullet_planning.git@dev",
"pybullet-planning-eaa",
"trimesh>=3.9.20",
"xatlas>=0.0.7",
"transforms3d==0.4.1",
Expand All @@ -54,7 +54,6 @@
version=__version__,
description="Grip is a prototyping toolbox for manipulation research.",
long_description=open("README.md").read(),
long_description_content_type="text/markdown",
url="https://github.com/dyson-ai/grip",
author="Ermano Arruda",
maintainer="Ermano Arruda",
Expand Down Expand Up @@ -96,6 +95,10 @@
share_dir + "/grip_assets/config",
glob.glob(os.path.join("grip_assets/config", "*.yaml")),
),
(
share_dir,
glob.glob("*.md"),
),
],
zip_safe=False,
entry_points={
Expand Down

0 comments on commit c76a040

Please sign in to comment.