Merge pull request #893 from openpathsampling/docs_deploy

Fix problem with doc deployment
openpathsampling · Jan 21, 2020 · 99603ea · 99603ea
2 parents 1bbd7a3 + 12d6a05
commit 99603ea
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -50,6 +50,7 @@ addons:
 
 env:
   global:
+    - COVERALLS_PARALLEL=true
     - TWINE_USERNAME="dwhswenson"
     # TWINE_PASSWORD (set via web)
     #- secure: "zs/3PN46wXFzTDli8LE9jJmNov27xAy7REaTK4s3DV9Ocmf5grqIUbUfFfa7XyOvamr6C7TSHib1SqQvEbHv416AcOD9FWZm9iNj0MO2dBimyXrvR50TFKG/dcp0Qzlp54hYFM4bEzWJZUVN120xynIKgfy74YBOA8DQ6B7FlyY="

diff --git a/devtools/ci/after_sucess.sh b/devtools/ci/after_sucess.sh
@@ -65,8 +65,8 @@ if [[ "$TRAVIS_BRANCH" == "master" ]]; then
 elif [[ "$TRAVIS_BRANCH" == "docs_deploy" ]]; then
     # change the behavior for the docs testing branch (docs_deploy branch in
     # the openpathsampling/openpathsampling GitHub repo) in this block
-    echo "No docs deploy on branch $TRAVIS_BRANCH"
-    #python devtools/ci/push-docs-to-s3.py --clobber
+    #echo "No docs deploy on branch $TRAVIS_BRANCH"
+    python devtools/ci/push-docs-to-s3.py #--clobber
 else
     echo "No docs deploy on branch $TRAVIS_BRANCH"
 fi

diff --git a/devtools/ci/push-docs-to-s3.py b/devtools/ci/push-docs-to-s3.py
@@ -16,10 +16,11 @@
 CLOBBER = opts.clobber
 
 BUCKET_NAME = 'openpathsampling.org'
-if not openpathsampling.version.release:
-    PREFIX = 'latest'
-else:
-    PREFIX = openpathsampling.version.short_version
+PREFIX = 'latest'
+# if not openpathsampling.version.release:
+    # PREFIX = 'latest'
+# else:
+    # PREFIX = openpathsampling.version.short_version
 
 def is_s3cmd_installed():
     dists = pkg_resources.working_set

diff --git a/devtools/minimal_testing.txt b/devtools/minimal_testing.txt
@@ -1,4 +1,4 @@
 nose
-pytest
+pytest!=5.3.4
 pytest-cov
 coveralls
diff --git a/devtools/testing_requirements.txt b/devtools/testing_requirements.txt
@@ -1,5 +1,5 @@
 nose
-pytest
+pytest!=5.3.4
 pytest-cov
-python-coveralls
+coveralls
 ipynbtest
diff --git a/docs/conf.py b/docs/conf.py
@@ -95,7 +95,7 @@
 
 # General information about the project.
 project = u'OpenPathSampling'
-copyright = u'2014-2019, David W.H. Swenson, Jan-Hendrik Prinz, John Chodera, Peter Bolhuis'
+copyright = u'2014-2020, David W.H. Swenson, Jan-Hendrik Prinz, John Chodera, Peter Bolhuis'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -104,7 +104,8 @@
 # The full version, including alpha/beta/rc tags.
 release = pkg_resources.get_distribution('openpathsampling').version
 # The short X.Y version.
-version = packaging.version.Version(release).base_version
+# version = packaging.version.Version(release).base_version
+version = release  # prefer to have the .dev0 label on 'latest'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/pinned b/pinned
@@ -0,0 +1 @@
+pytest!=5.3.4