Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Windows] Add console script entry point #656

Merged
merged 4 commits into from
Apr 3, 2020
+10 −13
Merged

[Windows] Add console script entry point #656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
579cd91
Add console script entry point
ooeygui Jul 26, 2018
b2cd767
remove scripts entry since we are using console_scripts.
seanyen Feb 8, 2019
83482c4
fix bad merge.
seanyen Jan 14, 2020
07294df
fix SKIP_PYTHON_SCRIPTS case.
seanyen Feb 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions scripts/rosdep
View file
Open in desktop

This file was deleted.

9 changes: 7 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,16 @@
'install_requires': ['catkin_pkg >= 0.4.0', 'rospkg >= 1.1.10', 'rosdistro >= 0.7.5', 'PyYAML >= 3.1'],
'test_suite': 'nose.collector',
'test_requires': ['mock', 'nose >= 1.0'],
'scripts': ['scripts/rosdep', 'scripts/rosdep-source'],
'author': 'Tully Foote, Ken Conley',
'author_email': '[email protected]',
'url': 'http://wiki.ros.org/rosdep',
'keywords': ['ROS'],
'entry_points': {
'console_scripts': [
'rosdep = rosdep2.main:rosdep_main',
'rosdep-source = rosdep2.install:install_main'
]
},
'classifiers': [
'Programming Language :: Python',
'License :: OSI Approved :: BSD License'],
Expand All @@ -30,6 +35,6 @@
kwargs['package_dir'] = {}
if 'SKIP_PYTHON_SCRIPTS' in os.environ:
kwargs['name'] += '_modules'
kwargs['scripts'] = {}
kwargs['entry_points'] = {}

setup(**kwargs)
10 changes: 3 additions & 7 deletions scripts/rosdep-source → src/rosdep2/install.py
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
from rosdep2 import InstallFailed
from rosdep2.platforms import source

NAME='rosdep-source'
NAME = 'rosdep-source'


def install_main():
Expand All @@ -49,16 +49,12 @@ def install_main():
parser.error("please specify one and only one rdmanifest url")
if args[0] != 'install':
parser.error("currently only support the 'install' command")
rdmanifest_url= args[1]
rdmanifest_url = args[1]
try:
if os.path.isfile(rdmanifest_url):
source.install_from_file(rdmanifest_url)
else:
source.install_from_url(rdmanifest_url)
except InstallFailed as e:
print("ERROR: installation failed:\n%s"%e, file=sys.stderr)
print("ERROR: installation failed:\n%s" % e, file=sys.stderr)
sys.exit(1)


if __name__ == '__main__':
install_main()