Skip to content
This repository has been archived by the owner on Jan 11, 2018. It is now read-only.

Commit

Permalink
Fix main.py's commandline functionalities
Browse files Browse the repository at this point in the history
Using version from setup broke main.py.  This fixes that
  • Loading branch information
d3ming committed Jan 14, 2016
1 parent 204bcbe commit 3251a48
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 26 deletions.
51 changes: 26 additions & 25 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,28 +40,29 @@ def git_version():
return version


setup(
name='tagcompare',
version=git_version(),
description='Capture and compare creative tags!',
url='https://github.com/paperg/tagcompare',
packages=['tagcompare', 'tagcompare.test'],
entry_points={
'console_scripts': [
'tagcapture = tagcompare.capture:main',
'tagcompare = tagcompare.main:main',
]
},
install_requires=[
'selenium',
'requests',
'pillow',
'enum34',
'coveralls'
],
package_data={
'': ['*.json'],
},
tests_require=['tox'],
cmdclass={'test': Tox}
)
if __name__ == '__main__':
setup(
name='tagcompare',
version=git_version(),
description='Capture and compare creative tags!',
url='https://github.com/paperg/tagcompare',
packages=['tagcompare', 'tagcompare.test'],
entry_points={
'console_scripts': [
'tagcapture = tagcompare.capture:main',
'tagcompare = tagcompare.main:main',
]
},
install_requires=[
'selenium',
'requests',
'pillow',
'enum34',
'coveralls'
],
package_data={
'': ['*.json'],
},
tests_require=['tox'],
cmdclass={'test': Tox}
)
2 changes: 1 addition & 1 deletion tagcompare/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def main():

if args.version:
# This gets handled by setup.py, we just need to not run the main routine
setup.git_version()
print(setup.git_version())
exit(0)

__update_settings_from_args(args)
Expand Down

0 comments on commit 3251a48

Please sign in to comment.