Skip to content

Commit

Permalink
Merge pull request #30 from boegel/master
Browse files Browse the repository at this point in the history
add vsc as a provided package such that vsc/__init__.py is installed as well, update vsc/__init__.py
  • Loading branch information
boegel committed Jan 18, 2014
2 parents dcc28a4 + 9c92cbf commit 6cdaac0
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
8 changes: 6 additions & 2 deletions lib/vsc/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
the vsc namespace is used in different folders allong the system
so explicitly declare this is also the vsc namespace
"""
import pkg_resources
pkg_resources.declare_namespace(__name__)
from pkgutil import extend_path

# we're not the only ones in this namespace
__path__ = extend_path(__path__, __name__) #@ReservedAssignment

# here for backwards compatibility
from vsc.utils import fancylogger
9 changes: 4 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,15 @@
from shared_setup import action_target, sdw
from shared_setup_mympirun import mympirun_vsc_install_scripts

VERSION = '3.3.0'
PACKAGE = {
'name': 'vsc-mympirun',
'provides': 'vsc-mympirun = 3.2.3',
'provides': 'vsc-mympirun = %s' % VERSION,
'install_requires': ['vsc-base >= 0.99'],
'version': '3.2.3',
'version': VERSION,
'author': [sdw],
'maintainer': [sdw],
'packages': ['vsc.mympirun', 'vsc.mympirun.mpi', 'vsc.mympirun.rm', 'vsc.mympirun.external'],
'py_modules': ['vsc.__init__'],
'namespace_packages': ['vsc'],
'packages': ['vsc.mympirun', 'vsc.mympirun.mpi', 'vsc.mympirun.rm', 'vsc.mympirun.external', 'vsc'],
'scripts': ['bin/mympirun.py', 'bin/pbsssh.sh', 'bin/sshsleep.sh', 'bin/mympisanity.py'],
'cmdclass': {
"install_scripts": mympirun_vsc_install_scripts,
Expand Down

0 comments on commit 6cdaac0

Please sign in to comment.