Merge pull request #100 from keisukefukuda/mpienv-init-bugfix

fix broken command invocation
keisukefukuda · Sep 21, 2018 · a1d3ea9 · a1d3ea9
2 parents 85218ca + 80b0c2e
commit a1d3ea9
Show file tree

Hide file tree

Showing 18 changed files with 28 additions and 31 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -36,7 +36,6 @@ python:
   # - "3.3"
   # - "3.4"
   # - 3.5
-  # - "3.5-dev" # 3.5 development branch
   - 3.6
   - 3.7-dev  # To be '3.7' ?
   - "nightly"

diff --git a/bin/mpienv-init b/bin/mpienv-init
@@ -39,7 +39,7 @@ function mpienv() {
         "use" )
             {
                 eval $(env PYTHONPATH=$MPIENV_ROOT:${PYTHONPATH:-} \
-                           mpienv-use.py $*)
+                           python -m mpienv.command.use $*)
                 if [ -z "${BASH_VERSION:-}" -a ! -z "${ZSH_VERSION:-}" ]; then
                     rehash
                 fi
@@ -48,79 +48,79 @@ function mpienv() {
         "configure" )
             {
                 env PYTHONPATH=$MPIENV_ROOT:${PYTHONPATH:-} \
-                    mpienv-configure.py "$@"
+                    python -m mpienv.command.configure "$@"
             }
             ;;
         "build" )
             {
                 env PYTHONPATH=$MPIENV_ROOT:${PYTHONPATH:-} \
-                    mpienv-build.py "$@"
+                    python -m mpienv.command.build "$@"
             }
             ;;
         "install" )
             {
                 env PYTHONPATH=$MPIENV_ROOT:${PYTHONPATH:-} \
-                    mpienv-install.py "$@"
+                    python -m mpienv.command.install "$@"
             }
             ;;
         "clean" )
             {
                 env PYTHONPATH=$MPIENV_ROOT:${PYTHONPATH:-} \
-                    mpienv-clean.py "$@"
+                    python -m mpienv.command.clean "$@"
             }
             ;;
         "add" )
             {
                env PYTHONPATH=$MPIENV_ROOT:${PYTHONPATH:-} \
-                   mpienv-add.py $*
+                   python -m mpienv.command.add $*
             }
             ;;
         "rm" )
             {
                 env PYTHONPATH=$MPIENV_ROOT:${PYTHONPATH:-} \
-                    mpienv-rm.py "$@"
+                    python -m mpienv.command.rm "$@"
             }
             ;;
         "rename" )
             {
                 env PYTHONPATH=$MPIENV_ROOT:${PYTHONPATH:-} \
-                    mpienv-rename.py "$@"
+                    python -m mpienv.command.rename "$@"
             }
             ;;
         "list" )
             {
                 env PYTHONPATH=$MPIENV_ROOT:${PYTHONPATH:-} \
-                    mpienv-list.py "$@"
+                    python -m mpienv.command.list "$@"
             }
             ;;
         "info" )
             {
                 env PYTHONPATH=$MPIENV_ROOT:${PYTHONPATH:-} \
-                    mpienv-info.py "$@"
+                    python -m mpienv.command.info "$@"
             }
             ;;
         "autodiscover" )
             {
                 env PYTHONPATH=$MPIENV_ROOT:${PYTHONPATH:-} \
-                    mpienv-autodiscover.py "$@"
+                    python -m mpienv.command.autodiscover "$@"
             }
             ;;
         "prefix" )
             {
                 env PYTHONPATH=$MPIENV_ROOT:${PYTHONPATH:-} \
-                    mpienv-prefix.py "$@"
+                    python -m mpienv.command.prefix "$@"
             }
             ;;
         "exec" )
             {
                 env PYTHONPATH=$MPIENV_ROOT:${PYTHONPATH:-} \
-                    mpienv-exec.py "$@"
+                    python -m mpienv.command.exec "$@"
             }
             ;;
         "help" )
             {
                 env PYTHONPATH=$MPIENV_ROOT:${PYTHONPATH:-} \
-                    mpienv-help.py "$@"
+                    python -m mpienv.command.help "$@"
             }
             ;;
         * )

diff --git a/mpienv/command/__init__.py b/mpienv/command/__init__.py
diff --git a/bin/mpienv-add.py → mpienv/command/add.py b/bin/mpienv-add.py → mpienv/command/add.py
diff --git a/bin/mpienv-autodiscover.py → mpienv/command/autodiscover.py b/bin/mpienv-autodiscover.py → mpienv/command/autodiscover.py
diff --git a/bin/mpienv-build.py → mpienv/command/build.py b/bin/mpienv-build.py → mpienv/command/build.py
diff --git a/bin/mpienv-configure.py → mpienv/command/configure.py b/bin/mpienv-configure.py → mpienv/command/configure.py
diff --git a/bin/mpienv-exec.py → mpienv/command/exec.py b/bin/mpienv-exec.py → mpienv/command/exec.py
diff --git a/bin/mpienv-help.py → mpienv/command/help.py b/bin/mpienv-help.py → mpienv/command/help.py
diff --git a/bin/mpienv-info.py → mpienv/command/info.py b/bin/mpienv-info.py → mpienv/command/info.py
diff --git a/bin/mpienv-install.py → mpienv/command/install.py b/bin/mpienv-install.py → mpienv/command/install.py
diff --git a/bin/mpienv-list.py → mpienv/command/list.py b/bin/mpienv-list.py → mpienv/command/list.py
diff --git a/bin/mpienv-prefix.py → mpienv/command/prefix.py b/bin/mpienv-prefix.py → mpienv/command/prefix.py
diff --git a/bin/mpienv-rename.py → mpienv/command/rename.py b/bin/mpienv-rename.py → mpienv/command/rename.py
diff --git a/bin/mpienv-rm.py → mpienv/command/rm.py b/bin/mpienv-rm.py → mpienv/command/rm.py
diff --git a/bin/mpienv-use.py → mpienv/command/use.py b/bin/mpienv-use.py → mpienv/command/use.py
diff --git a/setup.py b/setup.py
@@ -1,3 +1,4 @@
+from setuptools import find_packages
 from setuptools import setup
 
 setup(
@@ -7,19 +8,6 @@
     author="Keisuke Fukuda",
     author_email="keisukefukuda@gmail.com",
     url="https://github.com/keisukefukuda/mpienv",
-    scripts=['bin/mpienv-init',
-             'bin/mpienv-add.py',
-             'bin/mpienv-autodiscover.py',
-             'bin/mpienv-build.py',
-             'bin/mpienv-configure.py',
-             'bin/mpienv-exec.py',
-             'bin/mpienv-help.py',
-             'bin/mpienv-info.py',
-             'bin/mpienv-install.py',
-             'bin/mpienv-list.py',
-             'bin/mpienv-prefix.py',
-             'bin/mpienv-rename.py',
-             'bin/mpienv-rm.py',
-             'bin/mpienv-use.py'],
-    packages=['mpienv'],
+    scripts=['bin/mpienv-init'],
+    packages=find_packages(),
 )
diff --git a/tests/test_main.sh b/tests/test_main.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -u
+set -x
 
 # ==============================================================
 # Configuration
@@ -52,13 +53,22 @@ old_wd=$PWD
 echo "proj_dir=$proj_dir"
 
 # Load mpienv
+echo "=================== Install mpienv =================="
 cd ${proj_dir}
-python setup.py develop
+rm -rf mpienv.egg-info dist ||:
+pip install .
 
+echo "=================== Load mpienv =================="
+which mpienv-init
+
+set +x
 set +u
 eval "$(mpienv-init)"
 set -u
 
+echo "=================== Call mpienv =================="
+mpienv list
+
 cd ${test_dir}
 
 if [ ! -d "${test_dir}/shunit2" ] ; then