Skip to content

Commit

Permalink
Version 1.0.0 and PyPi support (#125)
Browse files Browse the repository at this point in the history
  • Loading branch information
sea-bass committed Jul 16, 2023
1 parent 39098d1 commit 42f6559
Show file tree
Hide file tree
Showing 9 changed files with 34 additions and 13 deletions.
10 changes: 10 additions & 0 deletions docs/source/setup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,16 @@ This package is being tested with:
* Python 3.10 in Ubuntu 22.04
* Optionally with ROS 2 Humble and Iron

pip install (Limited)
---------------------

You can quickly install ``pyrobosim`` through PyPi.
However, note that this will not include any of the ROS 2 or Task and Motion Planning functionality.

::

pip install pyrobosim

Local Setup
-----------

Expand Down
6 changes: 5 additions & 1 deletion pyrobosim/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
*build/
# Build artifacts
build/
dist/

# Autogenerated worlds
data/worlds/
3 changes: 3 additions & 0 deletions pyrobosim/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ROS 2 enabled 2D mobile robot simulator for behavior prototyping.

Refer to the [GitHub repo](https://github.com/sea-bass/pyrobosim) or [full documentation](https://pyrobosim.readthedocs.io/) for more information.
2 changes: 2 additions & 0 deletions pyrobosim/setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[metadata]
description-file = README.md
11 changes: 6 additions & 5 deletions pyrobosim/setup.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import os
from os.path import join
from setuptools import setup, find_packages

# This is for standalone (non-ROS) use.
Expand All @@ -10,10 +9,13 @@ def get_files_in_folder(directory):
file_list = []
for path, _, fnames in os.walk(directory):
for filename in fnames:
file_list.append(join("..", path, filename))
file_list.append(os.path.join("..", path, filename))
return file_list


project_name = "pyrobosim"

data_dir = os.path.join(project_name, "data")
install_requires = [
"adjustText",
"astar",
Expand All @@ -28,17 +30,16 @@ def get_files_in_folder(directory):
"trimesh",
]

project_name = "pyrobosim"
setup(
name=project_name,
version="0.0.0",
version="1.0.0",
url="https://github.com/sea-bass/pyrobosim",
author="Sebastian Castro",
author_email="sebas.a.castro@gmail.com",
description="ROS 2 enabled 2D mobile robot simulator for behavior prototyping.",
license="MIT",
install_requires=install_requires,
packages=find_packages(),
package_data={project_name: get_files_in_folder(join(project_name, "data"))},
package_data={project_name: get_files_in_folder(data_dir)},
zip_safe=True,
)
4 changes: 2 additions & 2 deletions pyrobosim_msgs/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>pyrobosim_msgs</name>
<version>0.0.0</version>
<version>1.0.0</version>
<description>Message definitions for pyrobosim package.</description>
<maintainer email="sebas.a.castro@gmail.com">Sebastian Castro</maintainer>
<license>BSD</license>
<license>MIT</license>

<!-- Build dependencies -->
<buildtool_depend>ament_cmake</buildtool_depend>
Expand Down
4 changes: 2 additions & 2 deletions pyrobosim_ros/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>pyrobosim_ros</name>
<version>0.0.0</version>
<version>1.0.0</version>
<description>ROS 2 wrapper around pyrobosim.</description>
<maintainer email="sebas.a.castro@gmail.com">Sebastian Castro</maintainer>
<license>BSD</license>
<license>MIT</license>

<!-- Build dependencies -->
<buildtool_depend>ament_cmake</buildtool_depend>
Expand Down
5 changes: 3 additions & 2 deletions pyrobosim_ros/setup.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
from setuptools import setup, find_packages


project_name = "pyrobosim_ros"

install_requires = [
"pyrobosim",
]

project_name = "pyrobosim_ros"
setup(
name=project_name,
version="0.0.0",
version="1.0.0",
url="https://github.com/sea-bass/pyrobosim",
author="Sebastian Castro",
author_email="sebas.a.castro@gmail.com",
Expand Down
2 changes: 1 addition & 1 deletion test/test_pyrobosim.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ def test_import():

def test_version():
ver = version("pyrobosim")
assert ver == "0.0.0", "Incorrect pyrobosim version"
assert ver == "1.0.0", "Incorrect pyrobosim version"

0 comments on commit 42f6559

Please sign in to comment.