Merge pull request #167 from prjemian/166-conda-packaging

changed plugin registration process

.travis.yml

@@ -27,6 +27,7 @@ before_script:
   - which conda
   - python --version
   - pip install coveralls
+  - pip install pyRestTable
   - which coveralls
 
 # command to run tests

CHANGES.rst

@@ -7,8 +7,16 @@ Change History
 Production
 **********
 
-:2020.0.2: expected *2019.07.09*, bug fixes and code review suggestions
+:2020.0.2: *2019.07.09*, bug fixes and code review suggestions
 
+    * `#166 <https://github.com/prjemian/spec2nexus/issues/166>`_
+       fix conda packaging
+
+:2020.0.2: *2019.07.09*, bug fixes and code review suggestions
+
+    NOTE: conda package is broken (no plugins directory).  
+    Only use ``pip install spec2nexus`` with this release.
+
     * `#164 <https://github.com/prjemian/spec2nexus/issues/164>`_
        post conda packages to `aps-anl-tag` channel
     * `#161 <https://github.com/prjemian/spec2nexus/issues/161>`_

publish.sh

@@ -39,12 +39,12 @@ echo "Building for upload to conda"
 export CONDA_BLD_PATH=/tmp/conda-bld
 /bin/mkdir -p ${CONDA_BLD_PATH}
 
-conda build ./conda-recipe/
-BUILD_DIR=${CONDA_BLD_PATH}/noarch
+export LOG_FILE=${CONDA_BLD_PATH}/${PACKAGE}-${RELEASE}-conda-build.log
+conda build ./conda-recipe/ 2>&1 | tee ${LOG_FILE}
+
+echo "upload to conda CHANNEL: ${CHANNEL}"
 _package_=$(echo ${PACKAGE} | tr '[:upper:]' '[:lower:]')
-BUNDLE=${BUILD_DIR}/${_package_}-${RELEASE}-*_0.tar.bz2
-echo "upload to conda"
-echo "CHANNEL: ${CHANNEL}"
+BUNDLE=${CONDA_BLD_PATH}/noarch/${_package_}-${RELEASE}-*_0.tar.bz2
 anaconda upload -u ${CHANNEL} ${BUNDLE}
 
 # also post to my personal channel

src/spec2nexus/extractSpecScan.py

@@ -32,7 +32,7 @@
 
 import os
 import sys
-from spec2nexus import spec
+from . import spec
 
 
 #-------------------------------------------------------------------------------------------

src/spec2nexus/nexus.py

@@ -26,8 +26,8 @@
     path = os.path.join('..', os.path.dirname(__file__))
     sys.path.insert(0, os.path.abspath(path))
 
-from spec2nexus import spec
-from spec2nexus import writer
+from . import spec
+from . import writer
 
 
 hdf5_extension = '.hdf5'