DOC and BLD: fixed doc and conda package build

Author: miladh

.conda-recipe/meta.yaml

@@ -6,14 +6,9 @@ source:
   git_url: ..
 
 build:
-  # noarch: python  # TODO Add back noarch when it works properly on Windows,
-                    # we are converting packages manually now
-  script:
-    # TODO remove this and add back quantities as conda package once its updated with the new numpy API
-    - pip install git+https://github.com/python-quantities/python-quantities.git
-    - python setup.py install
-    # - coverage run --source exdir -m py.test -s --doctest-glob='*.rst'
-    # - coverage report
+  noarch: python
+  script: python setup.py install
+
 requirements:
   build:
     - python
@@ -22,7 +17,6 @@ requirements:
   run:
     - python
     - setuptools
-    - pip
     - numpy
     - scipy
     - ruamel_yaml
@@ -33,13 +27,22 @@ test:
     - pytest-benchmark
     - h5py
     - six
+    - coverage
+    - codecov
+    - sphinx
+    - quantities
+
   source_files:
     - tests
+    - docs
   imports:
     - exdir
   commands:
     - python -c "import exdir; print(exdir.__version__)"
-    - pytest -s
+    - coverage run --source tests -m py.test -s
+    - coverage report
+    - codecov
+    - cd docs ; make doctest
 
 about:
   home: https://github.com/CINPLA/exdir/

.travis.yml

@@ -4,22 +4,10 @@ python:
   # - "3.5" # NOTE an issue with pathlib.resolve breaks our tests on 3.5
   - "3.6"
 install:
-  - source libs/travis-conda-scripts/scripts/config.sh
   - bash -ex libs/travis-conda-scripts/scripts/travis_install.sh
-before_script:
-  # this is for running test coverage on travis
-  # - pip install numpy
-  # - pip install git+https://github.com/python-quantities/python-quantities.git
-  # - pip install pytest pyyaml coverage codecov
-  - python setup.py install
 script:
-  # TODO run coverage in meta.yaml instead
-  # - coverage run --source exdir -m py.test -s --doctest-glob='*.rst'
-  # - coverage report
   - source libs/travis-conda-scripts/scripts/config.sh
   - bash -ex libs/travis-conda-scripts/scripts/build.sh
-after_success:
-  - codecov
 deploy:
   - provider: script
     skip_cleanup: true

docs/conf.py

@@ -24,8 +24,8 @@
 import os
 import re
 import sys
+# import exdir
 sys.path.insert(0, os.path.abspath("../"))
-import exdir
 
 on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
 if not on_rtd:  # only import and set the theme if we're building docs locally
@@ -93,14 +93,14 @@
 # built documents.
 #
 # The full version, including alpha/beta/rc tags.
-release = exdir.__version__.replace("v", "")
-print("Release", release)
-# The short X.Y version.
-version = release
-result = re.match(r"\d+\.\d+\.?\d*", release)
-if result:
-    version = result.group()
-print("Version", version)
+# release = exdir.__version__.replace("v", "")
+# print("Release", release)
+# # The short X.Y version.
+# version = release
+# result = re.match(r"\d+\.\d+\.?\d*", release)
+# if result:
+#     version = result.group()
+# print("Version", version)
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/environment.yml

@@ -1,6 +1,9 @@
 channels:
-- conda-forge
-- cinpla
+  - conda-forge
+
 dependencies:
-- exdir
-- python=3.5
+  - python=3.5
+  - setuptools
+  - numpy
+  - scipy
+  - ruamel_yaml

environment.yml

@@ -6,6 +6,6 @@
 [subrepo]
 	remote = [email protected]:CINPLA/travis-conda-scripts.git
 	branch = master
-	commit = 0187a2302604816237e3b3a86959aa8696b9a121
-	parent = ed78a1487be8d1d28e9aa739a46f78cd7d4e042c
+	commit = 02e37ccf390b322ad9b876d49674d1e605313740
+	parent = 1ddd49fa7c04f124bfa5f4e1717e974c19ad0f58
 	cmdver = 0.3.0

libs/travis-conda-scripts/.gitrepo

@@ -5,7 +5,7 @@ export GIT_TAG=$(git describe --always --tags --abbrev=0)
 export TAG_AND_TRAVIS_BUILD=${GIT_TAG}_b${TRAVIS_BUILD_NUMBER}
 export TAG_TRAVIS_BUILD_AND_COMMIT=${TAG_AND_TRAVIS_BUILD}_g${TRAVIS_COMMIT}
 export CONDA_BLD_PATH=/tmp/conda-bld
-export PACKAGE=$(conda build . --output --python "$TRAVIS_PYTHON_VERSION" --old-build-string)
+export PACKAGE=$(conda build . --output --old-build-string --python "$TRAVIS_PYTHON_VERSION" 2> conda-errors.log | tail -1)
 export EXTRA_CONDA_CHANNELS="-c defaults -c conda-forge -c cinpla"
 export GIT_STRING=${GIT_TAG}
 if [ -z $TRAVIS_TAG ]; then
@@ -21,3 +21,5 @@ echo TAG_AND_TRAVIS_BUILD $TAG_AND_TRAVIS_BUILD
 echo TAG_TRAVIS_BUILD_AND_COMMIT $TAG_TRAVIS_BUILD_AND_COMMIT
 echo PACKAGE $PACKAGE
 echo CONDA_CHANNELS $EXTRA_CONDA_CHANNELS
+echo conda-errors:
+cat conda-errors.log

libs/travis-conda-scripts/scripts/config.sh

@@ -4,6 +4,7 @@ else
   wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
 fi
 bash miniconda.sh -b -p $HOME/miniconda
+export PATH="$HOME/miniconda/bin:$PATH"
 hash -r
 conda config --set always_yes yes --set changeps1 no
 conda update -q conda

libs/travis-conda-scripts/scripts/travis_install.sh

@@ -4,28 +4,14 @@ if [ -z "$1" ]; then
     exit
 fi
 if [ $TRAVIS_TEST_RESULT -eq 0 ]; then
-    echo "Package name $PACKAGE"
-    conda convert "$PACKAGE" --platform win-64 -o packages
-    conda convert "$PACKAGE" --platform osx-64 -o packages
-    conda convert "$PACKAGE" --platform linux-64 -o packages
-    cd packages
     LABEL=${2:-main}
 
-    echo "Uploading source platform to anaconda with anaconda upload..."
-    set +x # hide token
-    anaconda -t "$CONDA_UPLOAD_TOKEN" upload -u "$1" --force "$PACKAGE" -l "$LABEL"
-    set -x
-    for os in $(ls); do
-        cd $os
-        for package in $(ls); do
-            echo "Uploading $package to anaconda with anaconda upload..."
-            set +x # hide token
-            anaconda -t "$CONDA_UPLOAD_TOKEN" upload -u "$1" --force "$package" -l "$LABEL"
-            set -x
-        done
-        cd ..
+    for TARBALL in $CONDA_BLD_PATH/noarch/*.tar.bz2; do
+        echo "Uploading $TARBALL to anaconda with anaconda upload..."
+        set +x # hide token
+        anaconda -t "$CONDA_UPLOAD_TOKEN" upload -u "$1" --force "$TARBALL" -l "$LABEL"
+        set -x
     done
-    cd ..
     echo "Upload command complete!"
 else
     echo "Upload cancelled due to failed test."