Skip to content

Commit

Permalink
Merge 0cea29c into 79b0bae
Browse files Browse the repository at this point in the history
  • Loading branch information
janfreyberg committed Apr 23, 2019
2 parents 79b0bae + 0cea29c commit 7261c59
Show file tree
Hide file tree
Showing 47 changed files with 960 additions and 504 deletions.
3 changes: 3 additions & 0 deletions .flake8
@@ -0,0 +1,3 @@
[flake8]
ignore = E203, W503
max-line-length = 80
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -68,3 +68,4 @@ docs/_build/
target/

\.ipynb_checkpoints/
docs/_build
19 changes: 19 additions & 0 deletions .readthedocs.yml
@@ -0,0 +1,19 @@
# .readthedocs.yml
# Read the Docs configuration file
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 2

# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: docs/conf.py

# Optionally build your docs in additional formats such as PDF and ePub
formats: html

# Optionally set the version of Python and requirements required to build your docs
python:
version: 3.7
install:
- requirements: docs/requirements.txt
44 changes: 41 additions & 3 deletions .travis.yml
@@ -1,8 +1,46 @@
dist: xenial
language: python
stages:
- "Static code analysis"
- test
- deploy
python:
- "3.5"
- "3.6"
- "3.7"
notifications:
email: false
install:
- pip install --upgrade pip
- pip install poetry
- poetry install
script:
- pip install flake8
- flake8 niwidgets
- python setup.py test
# run tests, and get coverage:
- poetry run python -m pytest --cov=src/
# test that the notebooks all run smoothly
# - find docs -name '*.ipynb' -o -name 'examples/*.ipynb' | xargs poetry run jupyter nbconvert --to notebook --execute
# submit coverage report to coveralls
- poetry run coveralls
jobs:
include:
- stage: "Static code analysis"
name: "black formatting test"
script:
- black --check src/
python: "3.7"
install:
- pip install -qq black
- stage: "Static code analysis"
name: "flake8 check"
script:
- flake8 src/
python: "3.7"
install:
- pip install -qq flake8
- stage: deploy
name: "Deploy to pypi"
if: tag IS present
script:
- poetry build
- poetry publish --username $PYPI_USER --password $PYPI_PASSWORD
python: "3.7"
3 changes: 0 additions & 3 deletions doc-requirements.txt

This file was deleted.

27 changes: 0 additions & 27 deletions doc/index.rst

This file was deleted.

22 changes: 22 additions & 0 deletions docs/Makefile
@@ -0,0 +1,22 @@
# Minimal makefile for Sphinx documentation
#

# You can set these variables from the command line.
SPHINXOPTS =
SPHINXBUILD = python -msphinx
SPHINXPROJ = niwidgets
SOURCEDIR = .
GH_PAGES_SOURCES = Makefile doc niwidgets index.ipynb
BUILDDIR = _build
# BUILDDIR = ..

# Put it first so that "make" without argument is like "make help".
help:
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

.PHONY: help Makefile

# Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 7261c59

Please sign in to comment.