Move scripts to appropriate directory
Having the scripts in the same directory with library code means that it'll be installed unconditionally regardless of version check in setup.py which makes it impossible to write separate tests for python 2 and 3. Fix this by moving the scripts into separate directory and adjusting init and setup files accordingly. This is necessary for implementing proper CI tests in follow-up patches. Change-Id: I30cdf0f85b2a60a235960911c9827f4129da40db
This commit is contained in:
parent
c35bb473e4
commit
120075a6a5
|
@ -1,14 +1,4 @@
|
|||
#!/usr/bin/env python
|
||||
__version__ = '0.0.3'
|
||||
__version__ = '0.0.4'
|
||||
|
||||
__all__ = ['obscvty', 'osmodumpdoc', 'osmotestconfig', 'osmotestvty',
|
||||
'osmoutil',
|
||||
'osmo_ipa',
|
||||
'osmo_ctrl',
|
||||
'soap',
|
||||
'twisted_ipa',
|
||||
'osmo_interact_common',
|
||||
'osmo_interact_vty',
|
||||
'osmo_interact_ctrl',
|
||||
'osmo_verify_transcript_vty',
|
||||
'osmo_verify_transcript_ctrl']
|
||||
__all__ = ['obscvty', 'osmoutil', 'osmo_ipa']
|
||||
|
|
18
setup.py
18
setup.py
|
@ -20,17 +20,15 @@ from osmopy import __version__
|
|||
import sys
|
||||
|
||||
if sys.version_info.major == 2:
|
||||
scripts = ["osmopy/osmodumpdoc.py", "osmopy/osmotestconfig.py",
|
||||
"osmopy/osmotestvty.py"]
|
||||
scripts = ["scripts/osmodumpdoc.py", "scripts/osmotestconfig.py",
|
||||
"scripts/osmotestvty.py"]
|
||||
elif sys.version_info.major == 3:
|
||||
scripts = ["osmopy/osmo_interact_vty.py",
|
||||
"osmopy/osmo_interact_ctrl.py",
|
||||
"osmopy/soap.py",
|
||||
"osmopy/osmo_ctrl.py",
|
||||
"osmopy/osmo_ipa.py",
|
||||
"osmopy/twisted_ipa.py",
|
||||
"osmopy/osmo_verify_transcript_vty.py",
|
||||
"osmopy/osmo_verify_transcript_ctrl.py"]
|
||||
scripts = ["scripts/osmo_interact_vty.py",
|
||||
"scripts/osmo_interact_ctrl.py",
|
||||
"scripts/soap.py",
|
||||
"scripts/twisted_ipa.py",
|
||||
"scripts/osmo_verify_transcript_vty.py",
|
||||
"scripts/osmo_verify_transcript_ctrl.py"]
|
||||
|
||||
setup(
|
||||
name = 'osmopython',
|
||||
|
|
Loading…
Reference in New Issue