Merge branch 'feature/fix-doc' into develop

plkx · May 31, 2018 · 55bd0af · 55bd0af
2 parents e9a9a9b + 9f102da
commit 55bd0af
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 7 deletions.
diff --git a/docs/mordred.rst b/docs/mordred.rst
@@ -12,8 +12,6 @@ mordred package
 .. autoclass:: mordred.Calculator
     :members:
 
-.. autofunction:: all_descriptors
-
 .. autofunction:: get_descriptors_from_module
 
 .. toctree::

diff --git a/docs/scripts/gen_default_descs.py b/docs/scripts/gen_default_descs.py
@@ -1,5 +1,7 @@
+import sys
 import load_path
-from mordred import Descriptor, descriptors, get_descriptors_from_module
+from mordred import Descriptor, descriptors, get_descriptors_from_module, __version__
+from distutils.version import StrictVersion
 
 load_path.nop()
 
@@ -55,10 +57,11 @@ def to_rst(self, hide_module=False):
 
 
 def get_all_descriptors():
+    v = StrictVersion(__version__)
     for mdl in descriptors.all:
         ds = []
         for Desc in get_descriptors_from_module(mdl):
-            for desc in Desc.preset():
+            for desc in Desc.preset(v):
                 ds.append(desc)
 
         yield ds

diff --git a/extra/ci/after_success.sh b/extra/ci/after_success.sh
@@ -10,7 +10,7 @@ fi
 
 if [[ -z "$TRAVIS_TAG" && -z "$APPVEYOR_REPO_TAG_NAME" ]]; then
     LABEL=dev
-    echo $(cat mordred/_version.txt).post1.dev1 > mordred/_version.txt
+    python extra/ci/bump-beta-version.py $(cat mordred/_version.txt) > mordred/_version.txt
 else
     LABEL=main
 fi
@@ -36,8 +36,12 @@ if [[ -f ~/.ssh/id_rsa && "$TRAVIS_PULL_REQUEST" == false && -n "$DOCUMENTATION"
     cd docs
     info make html
 
+    rm -rf gh-pages
     info git clone -b gh-pages $DOC_REMOTE gh-pages
-    info rm -r gh-pages/$TRAVIS_BRANCH || true
+    if [[ -d gh-pages/$TRAVIS_BRANCH ]]; then
+        info rm -r gh-pages/$TRAVIS_BRANCH
+    fi
+    mkdir -p gh-pages/$(dirname $TRAVIS_BRANCH)
     info cp -r _build/html gh-pages/$TRAVIS_BRANCH
 
     cd gh-pages

diff --git a/extra/ci/bump-beta-version.py b/extra/ci/bump-beta-version.py
@@ -0,0 +1,11 @@
+from distutils.version import StrictVersion
+import sys
+
+
+def main(version):
+    (major, minor, patch) = StrictVersion(version).version
+    print("{}.{}.{}a1".format(major, minor, patch + 1))
+
+
+if __name__ == "__main__":
+    main(sys.argv[1])
diff --git a/extra/ci/install.sh b/extra/ci/install.sh
@@ -10,7 +10,10 @@ if [[ -n "$TRAVIS_OS_NAME" ]]; then
     elif [[ "$TRAVIS_OS_NAME" == linux ]]; then
         export OS_NAME=Linux
     fi
-    info wget -q https://repo.continuum.io/miniconda/Miniconda3-latest-${OS_NAME}-x86_64.sh -O miniconda.sh
+    if [[ ! -f "miniconda.sh" ]]; then
+        info wget -q https://repo.continuum.io/miniconda/Miniconda3-latest-${OS_NAME}-x86_64.sh -O miniconda.sh
+    fi
+    rm -rf $HOME/miniconda
     info bash miniconda.sh -b -p $HOME/miniconda
 elif [[ -n "$APPVEYOR" ]]; then
     export OS_NAME=Windows

diff --git a/mordred/_matrix_attributes.py b/mordred/_matrix_attributes.py
@@ -201,6 +201,7 @@ def calculate(self, matrix):
 class VE1(MatrixAttributeBase):
     __slots__ = ()
 
+    @classmethod
     def description(cls):
         return "coefficient sum of the last eigenvector"