Merge pull request #110 from chrisjsewell/develop

Release v0.10.10

.coveragerc

@@ -1,3 +1,3 @@
 [run]
-omit = 
+omit =
     ipypublish/scripts/nb_setup.py

.flake8

@@ -1,6 +1,9 @@
 [flake8]
 max-line-length = 120
-exclude = 
+ignore =
+    E203,  # not compatible with black
+    W503   # not compatible with black
+exclude =
     setup.py,
     ipypublish/scripts/ipynb_latex_setup.py,
-    ipypublish/tests/test_files/basic_nb/expected/python_with_meta.py
+    ipypublish/tests/test_files/basic_nb/expected/python_with_meta.py

.github/ISSUE_TEMPLATE/bug_report.md

@@ -18,7 +18,7 @@ Steps to reproduce the behavior:
 
 1. step 1
 2. step 2
- 
+
 (for extended explanation, use the additional context section)
 
 ## Minimal Notebook Example

.pre-commit-config.yaml

@@ -1,39 +1,49 @@
 # Install pre-commit hooks via
 # pre-commit install
 
-- repo: git://github.com/pre-commit/pre-commit-hooks
-  sha: v2.2.3
-  hooks:
-  - id: check-json
-  - id: check-yaml
-  - id: end-of-file-fixer
-  - id: trailing-whitespace
-  - id: double-quote-string-fixer
-  - id: flake8
-
-- repo: local
-  hooks:
-
-  - id: yapf
-    name: Yet Another Python Formatter
-    entry: yapf
-    language: system
-    types: [python]
-    args: ["-i", "-vv"]
-    exclude: >
-            (?x)^(
-                setup.py
-            )$
-
-  - id: doc8
-    name: RST Linting
-    entry: doc8
-    language: system
-    types: [rst]
-
-  # - id: travis-linter
-  #   name: Travis Lint
-  #   entry: travis lint
-  #   files: .travis.yml
-  #   language: ruby
-  #   additional_dependencies: ['travis']
+exclude: >-
+  (?x)^(
+    .vscode/settings.json|
+    docs/build/.*|
+    example/.*|
+    ipypublish/tests/test_files/.*|
+    ipypublish/sphinx/tests/sourcedirs/.*|
+    ipypublish/sphinx/config.yaml|
+    docs/source/custom_export_config.rst
+  )$
+
+  # TODO docs/source/custom_export_config.rst is excleded because doc8
+  # complains about :linenos: in code-block
+
+repos:
+
+  - repo: git://github.com/pre-commit/pre-commit-hooks
+    sha: v2.2.3
+    hooks:
+    - id: check-json
+    - id: check-yaml
+    - id: end-of-file-fixer
+    - id: trailing-whitespace
+    - id: flake8
+
+  - repo: https://github.com/psf/black
+    rev: 19.3b0
+    hooks:
+    - id: black
+
+  - repo: local
+    hooks:
+
+    - id: doc8
+      name: RST Linting
+      entry: doc8
+      language: system
+      exclude: docs/build/*
+      types: [rst]
+
+    # - id: travis-linter
+    #   name: Travis Lint
+    #   entry: travis lint
+    #   files: .travis.yml
+    #   language: ruby
+    #   additional_dependencies: ['travis']

.readthedocs.yml

@@ -16,4 +16,3 @@ python:
 #   builder: html
 #   configuration: conf.py
 #   fail_on_warning: true
-

.travis.yml

@@ -5,7 +5,7 @@ matrix:
     sudo: required
     python: 3.6
     dist: trusty
-    env: TEST_TYPE="flake8"
+    env: TEST_TYPE="pre-commit"
   - os: linux
     sudo: required
     python: 3.6
@@ -18,18 +18,18 @@ matrix:
     env: TEST_TYPE="pytest" PYPI_DEPLOY=true
   - os: linux
     sudo: required
-    python: 2.7
-    dist: trusty
+    python: 3.7
+    dist: xenial
     env: TEST_TYPE="pytest"
   - os: linux
     sudo: required
-    python: 3.5
+    python: 2.7
     dist: trusty
     env: TEST_TYPE="pytest"
   - os: linux
     sudo: required
-    python: 3.7
-    dist: xenial
+    python: 3.5
+    dist: trusty
     env: TEST_TYPE="pytest"
   # TODO this takes too long to install
   # - os: osx
@@ -76,13 +76,13 @@ matrix:
   allow_failures:
     - os: linux
       sudo: required
-      python: 3.5
+      python: 2.7
       dist: trusty
       env: TEST_TYPE="pytest"
     - os: linux
       sudo: required
-      python: 3.7
-      dist: xenial
+      python: 3.5
+      dist: trusty
       env: TEST_TYPE="pytest"
     - os: osx
       language: generic
@@ -123,13 +123,16 @@ install:
 - pip install -U pip setuptools wheel
 - if [[ "$TEST_TYPE" == "pytest" ]]; then travis_wait pip install .[tests] ; fi
 - if [[ "$TEST_TYPE" == "pytest" ]]; then pip install --quiet coveralls ; fi
-- if [[ "$TEST_TYPE" == "flake8" ]]; then travis_wait pip install "flake8(>=3.7,<3.8)" ; fi
+- if [[ "$TEST_TYPE" == "pre-commit" ]]; then pip install -e .[code_style]; fi
 - if [[ "$TEST_TYPE" == "rtd" ]]; then travis_wait pip install .[rtd] ; fi
 
 script:
 - if [[ "$TEST_TYPE" == "pytest" ]]; then pytest -v --cov=ipypublish --cov-config .coveragerc --cov-report= ipypublish ; fi
 - if [[ "$TEST_TYPE" == "pytest" ]]; then nbpublish -pdf --pdf-debug -log debug example/notebooks/Example.ipynb ; fi
-- if [[ "$TEST_TYPE" == "flake8" ]]; then flake8 . ; fi
+- |
+  if [[ "$TEST_TYPE" == "pre-commit" ]]; then
+    pre-commit run --all-files || ( git status --short ; git diff ; exit 1 )
+  fi
 - if [[ "$TEST_TYPE" == "rtd" ]]; then cd docs; make ; fi
 
 after_success:

.vscode/jinja2-latex.code-snippets

@@ -10,13 +10,13 @@
         "scope": "jinja-latex",
         "body": "((* set ${1:name} = ${2:value} *))",
         "description": "set variable"
-    },   
+    },
     "print": {
         "prefix": "print",
         "scope": "inja-latex",
         "body": "((( ${1:variable} )))",
         "description": "print variable"
-    },   
+    },
     "block": {
         "prefix": "block",
         "scope": "jinja-latex",
@@ -73,4 +73,4 @@
         ],
         "description": "if-else condition"
     }
-}
+}

.vscode/jinja2.code-snippets

@@ -10,13 +10,13 @@
         "scope": "jinja,jinja-yaml,jinja-html",
         "body": "{% set ${1:name} = ${2:value} %}",
         "description": "set variable"
-    },   
+    },
     "print": {
         "prefix": "print",
         "scope": "jinja,jinja-yaml,jinja-html",
         "body": "{{ ${1:variable} }}",
         "description": "print variable"
-    },   
+    },
     "block": {
         "prefix": "block",
         "scope": "jinja,jinja-yaml,jinja-html",
@@ -73,4 +73,4 @@
         ],
         "description": "if-else condition"
     }
-}
+}

.vscode/settings.json

@@ -26,46 +26,47 @@
     "python.linting.pylamaEnabled": false,
     "python.linting.enabled": true,
     "python.linting.flake8Enabled": true,
-    "python.formatting.provider": "yapf",
+    "python.formatting.provider": "black",
     "cSpell.words": [
         "Jupyter",
         "docutils",
         "ipynb",
         "ipypublish",
+        "ipywidgets",
         "jupytext",
         "nbconvert",
         "nbpresent",
         "noqa",
         "placeholders",
         "plugins"
     ],
-    "todo-tree.tags": [
-        "TODO",
-        "todo::",
-        "FIXME",
-        "NOTE"
-      ],
-    "todo-tree.regex": "((//|#-?|<!--|\\.\\.|;|/\\*|^)\\s*($TAGS)|^\\s*- \\[ \\])",
-    "todo-tree.defaultHighlight": {
-        "icon": "alert",
-        "type": "tag",
-        "foreground": "orange",
-        "background": "white",
-        "opacity": 10
-    },
-    "todo-tree.customHighlight": {
+    "yaml.format.enable": true,
+
+    "markdown-preview-enhanced.usePandocParser": true,
+    "markdown-preview-enhanced.pandocPath": "/anaconda/envs/ipypublish_dev/bin/pandoc",
+    "markdown-preview-enhanced.pandocArguments": "--filter=/anaconda/envs/ipypublish_dev/bin/ipubpandoc",
+    "markdown-preview-enhanced.enableScriptExecution": true,
+    "todo-tree.highlights.customHighlight": {
         "NOTE": {
             "icon": "check",
             "type": "tag",
             "foreground": "green",
+            "background": "white",
+            "opacity": 10
+        }
+    },
+    "todo-tree.highlights.defaultHighlight": {
+        "icon": "alert",
+        "type": "tag",
+        "foreground": "#FFA500",
         "background": "white",
         "opacity": 10
-        }
     },
-    "yaml.format.enable": true,
-
-    "markdown-preview-enhanced.usePandocParser": true,
-    "markdown-preview-enhanced.pandocPath": "/anaconda/envs/ipypublish_dev/bin/pandoc",
-    "markdown-preview-enhanced.pandocArguments": "--filter=/anaconda/envs/ipypublish_dev/bin/ipubpandoc",
-    "markdown-preview-enhanced.enableScriptExecution": true
-}
+    "todo-tree.regex.regex": "((//|#-?|<!--|\\.\\.|;|/\\*|^)\\s*($TAGS)|^\\s*- \\[ \\])",
+    "todo-tree.general.tags": [
+        "TODO",
+        "todo::",
+        "FIXME",
+        "NOTE"
+    ]
+}