Skip to content
This repository has been archived by the owner on Nov 21, 2023. It is now read-only.

gh-pages fixes #240

Merged
merged 2 commits into from
Nov 6, 2018
+4 −7
Merged

gh-pages fixes #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac09792
Small fixes for docs-deploy CI job
jklukas Nov 5, 2018
c3eb2c3
Get test suite working with latest moto
jklukas Nov 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ jobs:
git config user.email "[email protected]"
git config user.name "CircleCI docs-deploy job"
npm install -g --silent [email protected]
gh-pages -d docs/_build/html
gh-pages --dotfiles --message "[skip ci] Updates" --dist docs/_build/html
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The --dotfiles flag is necessary for the .nojekyll file to get committed. The [skip ci] message prevents CircleCI from trying to build the gh-pages branch after this commit (which we expect to fail because it doesn't have the source code).


lint:
docker:
Expand Down
9 changes: 3 additions & 6 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,9 @@ skipsdist = True
usedevelop = True
extras = testing
commands = pytest {posargs:tests/}

# 2018-09-14: moto isn't working with latest boto3, so we need to pin version for tests;
# see https://github.com/spulec/moto/pull/1801
# TODO: Remove this once moto restores compatibility
deps =
boto3==1.7.84
setenv =
AWS_SECRET_ACCESS_KEY=dummy_secret_needed_for_moto_tests
AWS_ACCESS_KEY_ID=dummy_key_needed_for_moto_tests
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Follows new example in getmoto/moto#1907


[testenv:lint]
deps =
Expand Down