From 874a49059ee6712e1d189ec24e5a342651946546 Mon Sep 17 00:00:00 2001 From: cadop Date: Wed, 22 May 2024 09:43:47 -0400 Subject: [PATCH 1/4] Add setup.py extras --- README.md | 6 ++++++ setup.py | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/README.md b/README.md index 7b52c1379..cbff9fac6 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,8 @@ The easiest way to install Warp is from [PyPI](https://pypi.org/project/warp-lan pip install warp-lang +You can also use `pip install warp-lang[extras]` to install additional dependencies for USD-related features. + Pre-built binary packages are also available on the [Releases](https://github.com/NVIDIA/warp/releases) page. To install in your local Python environment run the following command from the download directory: pip install warp_lang-.whl @@ -66,6 +68,10 @@ print(lengths) The `examples` directory contains a number of scripts that show how to implement different simulation methods using the Warp API. Most examples will generate USD files containing time-sampled animations (stored in the current working directory). Before running examples, users should ensure that the ``usd-core``, ``matplotlib``, and ``pyglet`` packages are installed using: + pip install warp-lang[examples] + +Or can be manually installed with: + pip install usd-core matplotlib pyglet Examples can be run from the command-line as follows: diff --git a/setup.py b/setup.py index 4dd009aac..d468ef5fe 100644 --- a/setup.py +++ b/setup.py @@ -198,6 +198,14 @@ def get_warp_libraries(platform): ] + warp_binary_libraries, }, + extras_require={ + 'examples': [ + 'usd-core', 'matplotlib', 'pyglet', + ], + 'extras': [ + 'usd-core' + ] + }, distclass=BinaryDistribution, cmdclass={ "bdist_wheel": WarpBDistWheel, From b253f3d9618cc99c9f609d49bf8da4155e32727c Mon Sep 17 00:00:00 2001 From: cadop Date: Thu, 23 May 2024 10:52:20 -0400 Subject: [PATCH 2/4] Revert "Add setup.py extras" This reverts commit 874a49059ee6712e1d189ec24e5a342651946546. --- setup.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/setup.py b/setup.py index d468ef5fe..4dd009aac 100644 --- a/setup.py +++ b/setup.py @@ -198,14 +198,6 @@ def get_warp_libraries(platform): ] + warp_binary_libraries, }, - extras_require={ - 'examples': [ - 'usd-core', 'matplotlib', 'pyglet', - ], - 'extras': [ - 'usd-core' - ] - }, distclass=BinaryDistribution, cmdclass={ "bdist_wheel": WarpBDistWheel, From a291eb7ab0d4760b9d5abc96e49618fe2a39ee35 Mon Sep 17 00:00:00 2001 From: cadop Date: Thu, 23 May 2024 11:04:34 -0400 Subject: [PATCH 3/4] move dependencies to pyproject.toml --- pyproject.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 1db83b01c..5ae1f9ebd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,6 +27,8 @@ Changelog = "https://github.com/NVIDIA/warp/blob/main/CHANGELOG.md" [project.optional-dependencies] dev = ["pre-commit", "ruff", "nvtx", "furo", "sphinx-copybutton", "coverage[toml]"] +examples = ['usd-core', 'matplotlib', 'pyglet'] +extras = ['usd-core'] [tool.setuptools.packages.find] include = ["warp*"] From 049ffddfc763f408cacca6d7fbb1b752a2c520c6 Mon Sep 17 00:00:00 2001 From: cadop Date: Tue, 28 May 2024 17:39:34 -0400 Subject: [PATCH 4/4] consolidate to extras --- README.md | 4 ++-- pyproject.toml | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index cbff9fac6..aa9c12047 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ The easiest way to install Warp is from [PyPI](https://pypi.org/project/warp-lan pip install warp-lang -You can also use `pip install warp-lang[extras]` to install additional dependencies for USD-related features. +You can also use `pip install warp-lang[extras]` to install additional dependencies for running examples and USD-related features. Pre-built binary packages are also available on the [Releases](https://github.com/NVIDIA/warp/releases) page. To install in your local Python environment run the following command from the download directory: @@ -68,7 +68,7 @@ print(lengths) The `examples` directory contains a number of scripts that show how to implement different simulation methods using the Warp API. Most examples will generate USD files containing time-sampled animations (stored in the current working directory). Before running examples, users should ensure that the ``usd-core``, ``matplotlib``, and ``pyglet`` packages are installed using: - pip install warp-lang[examples] + pip install warp-lang[extras] Or can be manually installed with: diff --git a/pyproject.toml b/pyproject.toml index 5ae1f9ebd..18c1a5791 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,8 +27,7 @@ Changelog = "https://github.com/NVIDIA/warp/blob/main/CHANGELOG.md" [project.optional-dependencies] dev = ["pre-commit", "ruff", "nvtx", "furo", "sphinx-copybutton", "coverage[toml]"] -examples = ['usd-core', 'matplotlib', 'pyglet'] -extras = ['usd-core'] +extras = ['usd-core', 'matplotlib', 'pyglet'] [tool.setuptools.packages.find] include = ["warp*"]