Commit 3f6197dc authored by Mayank Mittal's avatar Mayank Mittal

simplifies reading of versioning in setup.py

parent c3a2dd03
...@@ -44,7 +44,7 @@ To upload images to a PR -- simply drag and drop an image while in edit mode and ...@@ -44,7 +44,7 @@ To upload images to a PR -- simply drag and drop an image while in edit mode and
- [ ] I have made corresponding changes to the documentation - [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings - [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my feature works - [ ] I have added tests that prove my fix is effective or that my feature works
- [ ] I have updated the changelog and the corresponding version in the extension's `setup.py` and `config/extension.toml` files - [ ] I have updated the changelog and the corresponding version in the extension's `config/extension.toml` file
<!-- <!--
As you go through the checklist above, you can mark something as done by putting an x character in it As you go through the checklist above, you can mark something as done by putting an x character in it
......
...@@ -5,17 +5,24 @@ ...@@ -5,17 +5,24 @@
"""Installation script for the 'omni.isaac.contrib_envs' python package.""" """Installation script for the 'omni.isaac.contrib_envs' python package."""
import os
import toml
from setuptools import setup from setuptools import setup
# Obtain the extension data from the extension.toml file
EXTENSION_PATH = os.path.dirname(os.path.realpath(__file__))
# Read the extension.toml file
EXTENSION_TOML_DATA = toml.load(os.path.join(EXTENSION_PATH, "config", "extension.toml"))
# Installation operation # Installation operation
setup( setup(
name="omni-isaac-contrib_envs", name="omni-isaac-contrib_envs",
author="Community", author="Community",
url="https://github.com/NVIDIA-Omniverse/orbit", url=EXTENSION_TOML_DATA["package"]["repository"],
version="0.1.0", version=EXTENSION_TOML_DATA["package"]["version"],
description="Python module for contributed robotic environments built using ORBIT / Isaac Sim.", description=EXTENSION_TOML_DATA["package"]["description"],
keywords=["robotics", "rl"], keywords=EXTENSION_TOML_DATA["package"]["keywords"],
include_package_data=True, include_package_data=True,
python_requires=">=3.7.*", python_requires=">=3.7.*",
packages=["omni.isaac.contrib_envs"], packages=["omni.isaac.contrib_envs"],
......
...@@ -5,9 +5,16 @@ ...@@ -5,9 +5,16 @@
"""Installation script for the 'omni.isaac.orbit' python package.""" """Installation script for the 'omni.isaac.orbit' python package."""
import os
import toml
from setuptools import setup from setuptools import setup
# Obtain the extension data from the extension.toml file
EXTENSION_PATH = os.path.dirname(os.path.realpath(__file__))
# Read the extension.toml file
EXTENSION_TOML_DATA = toml.load(os.path.join(EXTENSION_PATH, "config", "extension.toml"))
# Minimum dependencies required prior to installation # Minimum dependencies required prior to installation
INSTALL_REQUIRES = [ INSTALL_REQUIRES = [
# generic # generic
...@@ -24,11 +31,11 @@ setup( ...@@ -24,11 +31,11 @@ setup(
author="NVIDIA, ETH Zurich, and University of Toronto", author="NVIDIA, ETH Zurich, and University of Toronto",
maintainer="Mayank Mittal", maintainer="Mayank Mittal",
maintainer_email="mittalma@ethz.ch", maintainer_email="mittalma@ethz.ch",
url="https://github.com/NVIDIA-Omniverse/orbit", url=EXTENSION_TOML_DATA["package"]["repository"],
version=EXTENSION_TOML_DATA["package"]["version"],
description=EXTENSION_TOML_DATA["package"]["description"],
keywords=EXTENSION_TOML_DATA["package"]["keywords"],
license="BSD-3-Clause", license="BSD-3-Clause",
version="0.1.0",
description="Python module for the core framework interfaces of ORBIT.",
keywords=["robotics", "simulation", "sensors"],
include_package_data=True, include_package_data=True,
python_requires=">=3.7.*", python_requires=">=3.7.*",
install_requires=INSTALL_REQUIRES, install_requires=INSTALL_REQUIRES,
......
...@@ -5,11 +5,17 @@ ...@@ -5,11 +5,17 @@
"""Installation script for the 'omni.isaac.orbit_envs' python package.""" """Installation script for the 'omni.isaac.orbit_envs' python package."""
import itertools import itertools
import os
import toml
from setuptools import setup from setuptools import setup
# Obtain the extension data from the extension.toml file
EXTENSION_PATH = os.path.dirname(os.path.realpath(__file__))
# Read the extension.toml file
EXTENSION_TOML_DATA = toml.load(os.path.join(EXTENSION_PATH, "config", "extension.toml"))
# Minimum dependencies required prior to installation # Minimum dependencies required prior to installation
INSTALL_REQUIRES = [ INSTALL_REQUIRES = [
# generic # generic
...@@ -40,10 +46,10 @@ setup( ...@@ -40,10 +46,10 @@ setup(
author="NVIDIA, ETH Zurich, and University of Toronto", author="NVIDIA, ETH Zurich, and University of Toronto",
maintainer="Mayank Mittal", maintainer="Mayank Mittal",
maintainer_email="mittalma@ethz.ch", maintainer_email="mittalma@ethz.ch",
url="https://github.com/NVIDIA-Omniverse/orbit", url=EXTENSION_TOML_DATA["package"]["repository"],
version="0.1.0", version=EXTENSION_TOML_DATA["package"]["version"],
description="Python module for robotic environments built using ORBIT.", description=EXTENSION_TOML_DATA["package"]["description"],
keywords=["robotics", "rl"], keywords=EXTENSION_TOML_DATA["package"]["keywords"],
include_package_data=True, include_package_data=True,
python_requires=">=3.7.*", python_requires=">=3.7.*",
install_requires=INSTALL_REQUIRES, install_requires=INSTALL_REQUIRES,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment