Skip to content

Instantly share code, notes, and snippets.

@boegel
Created January 17, 2014 23:02
Show Gist options
  • Save boegel/8483302 to your computer and use it in GitHub Desktop.
Save boegel/8483302 to your computer and use it in GitHub Desktop.
-bash-4.1$ ./bdist_rpm.sh &> /dev/null
-bash-4.1$ rpm -q --filesbypkg -p dist/python-vsc-mympirun-3.2.3-1.ug.noarch.rpm | grep vsc/__init__.py
-bash-4.1$ rm -rf /tmp/vsc40023/vsc-mympirun-test/*; mkdir -p /tmp/vsc40023/vsc-mympirun-test/lib/python2.6/site-packages; export PYTHONPATH=/tmp/vsc40023/vsc-mympirun-test/lib/python2.6/site-packages:$PYTHONPATH; python setup.py install --prefix=/tmp/$USER/vsc-mympirun-test --single-version-externally-managed --record /tmp/$USER/foo --no-compile &> /dev/null-bash-4.1$
-bash-4.1$
-bash-4.1$
-bash-4.1$
-bash-4.1$ TESTDIR=/tmp/vsc40023/vsc-mympirun-test; rm -rf $TESTDIR/*; mkdir -p $TESTDIR/lib/python2.6/site-packages; export PYTHONPATH=$TESTDIR/lib/python2.6/site-packages:$PYTHONPATH; python setup.py install --prefix=$TESTDIR --single-version-externally-managed --record /tmp/$USER/foo --no-compile &> /dev/null-bash-4.1$ ls $TESTDIR/lib/python2.6/site-packages/vsc/__init__.py
/tmp/vsc40023/vsc-mympirun-test/lib/python2.6/site-packages/vsc/__init__.py
-bash-4.1$
-bash-4.1$ git diff
diff --git a/bdist_rpm.sh b/bdist_rpm.sh
index d1ac12a..4c18899 100755
--- a/bdist_rpm.sh
+++ b/bdist_rpm.sh
@@ -78,6 +78,7 @@ for package in $ALL_PACKAGES; do
--change-spec-provides="sed -e 's/${package}/python-${package}/g'" \
--change-spec-requires="sed -r 's/^Requires:(\s\s*)(${requirements})/Requires:\1python-\2/'" \
--change-spec-preamble="sed -e 's/^\(Release:\s\s*\)\(.*\)\s*$/\1${release}.ug/'" \
+ --change-files="sed -i '/vsc\/__init__.py/d' \$RPMREBUILD_TMPDIR/work/files.1" \
--directory=./dist \
${edit} -n -p ${rpm_target}
echo "Finished building RPM for $package"
diff --git a/setup.py b/setup.py
index 53beae7..f73d1f3 100644
--- a/setup.py
+++ b/setup.py
@@ -39,9 +39,9 @@ PACKAGE = {
'version': '3.2.3',
'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'],
+ #'py_modules': ['vsc.__init__'],
+ #'namespace_packages': ['vsc'],
'scripts': ['bin/mympirun.py', 'bin/pbsssh.sh', 'bin/sshsleep.sh', 'bin/mympisanity.py'],
'cmdclass': {
"install_scripts": mympirun_vsc_install_scripts,
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment