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

Switch to MKDocs #602

Merged
merged 7 commits into from
Dec 7, 2017
Merged
Changes from 1 commit
Commits
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
3 changes: 2 additions & 1 deletion makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ install:
deploy:
python setup.py sdist --manifest-only
python setup.py sdist --formats zip,gztar upload
mkdocs gh-deploy -r pages -b master
Copy link
Member Author

Choose a reason for hiding this comment

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

Turns out this doesn't work. It hoses your local master branch the first time and then (after more commits are added) results in merge conflicts. See c-w/ghp-import#65 for details.


.PHONY : build
build:
Expand All @@ -36,7 +37,6 @@ build-win:
.PHONY : docs
docs:
mkdocs build --clean
cd site && zip -r ../docs.zip .

.PHONY : test
test:
Expand All @@ -62,4 +62,5 @@ clean:
rm -rf build
rm -rf dist
rm -rf tmp
rm -rf site
# git clean -dfx'