Skip to content

Commit

Permalink
now storing log in ROS_HOME when running on ROS as installed package.
Browse files Browse the repository at this point in the history
cosmetics.
  • Loading branch information
asmodehn committed Apr 22, 2018
1 parent 1424d4e commit 6b60638
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 44 deletions.
37 changes: 0 additions & 37 deletions pypi_release.sh

This file was deleted.

4 changes: 2 additions & 2 deletions rostful/flaskapp.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ def create_app(configfile_override=None, logfile=None):
try:
ros_path = r.get_path(__package__) # find rospkg with same name as this python package
if ros_path.endswith(os.path.join('share', __package__)): # ROS installed package
instance_path = ros_path # using the ROS share path for configuration
# TODO: check if there is a better choice ?
instance_path = os.path.join(os.environ.get('ROS_HOME', os.path.join(os.environ['HOME'], '.ros')), 'rostful') # using ROS_HOME/rostful as instance path
# instance_path = ros_path # using the ROS share path for configuration # BAD IDEA : might not be writeable
else:
package_path = ros_path # fixing detected package_path in ROS devel case (to access config template file)
instance_path = os.path.join(ros_path, 'instance') # getting instance folder from source
Expand Down
6 changes: 1 addition & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# Best Flow :
# Clean previous build & dist
# $ gitchangelog >CHANGELOG.rst
# change version in code and changelog (AND in package .xml for ROS !)
# change version in code and changelog
# $ python setup.py prepare_release
# WAIT FOR TRAVIS CHECKS
# $ python setup.py publish
Expand Down Expand Up @@ -143,10 +143,6 @@ def run(self):
'simplejson',
'tblib>=1.2',
],
test_suite="nose.collector",
tests_require=[
'nose>=1.3.7'
],
cmdclass={
'prepare_release': PrepareReleaseCommand,
'publish': PublishCommand,
Expand Down

0 comments on commit 6b60638

Please sign in to comment.