Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix problem with doc deployment #893

Merged
merged 9 commits into from
Jan 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ addons:

env:
global:
- COVERALLS_PARALLEL=true
- TWINE_USERNAME="dwhswenson"
# TWINE_PASSWORD (set via web)
#- secure: "zs/3PN46wXFzTDli8LE9jJmNov27xAy7REaTK4s3DV9Ocmf5grqIUbUfFfa7XyOvamr6C7TSHib1SqQvEbHv416AcOD9FWZm9iNj0MO2dBimyXrvR50TFKG/dcp0Qzlp54hYFM4bEzWJZUVN120xynIKgfy74YBOA8DQ6B7FlyY="
Expand Down
4 changes: 2 additions & 2 deletions devtools/ci/after_sucess.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 5 additions & 4 deletions devtools/ci/push-docs-to-s3.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion devtools/minimal_testing.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
nose
pytest
pytest!=5.3.4
pytest-cov
coveralls
4 changes: 2 additions & 2 deletions devtools/testing_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
nose
pytest
pytest!=5.3.4
pytest-cov
python-coveralls
coveralls
ipynbtest
5 changes: 3 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand Down
1 change: 1 addition & 0 deletions pinned
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pytest!=5.3.4