Merge branch 'master' into feature/pre_embedimages

Author: Jürgen Hasch

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.2.8
+current_version = 0.4.0
 commit = True
 message = release {new_version}
 tag = False

.travis.yml

@@ -82,7 +82,6 @@ matrix:
   allow_failures:
     - env: TOXENV=appveyorartifacts
     - env: TOXENV=docs_linkcheck
-    - env: TOXENV=lint
 env:
   global:
     - LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
@@ -105,24 +104,13 @@ before_install:
   - 'if [[ ${OSX_PYTHON} ]]; then if [[ $(which python3.4) ]]; then ls -l $(which python3.4); else echo "missing"; fi; fi'
   - 'if [[ ${OSX_PYTHON} ]]; then if [[ $(which python3.5) ]]; then ls -l $(which python3.5); else echo "missing"; fi; fi'
   # stuff for conda recipe
-  # Note we're currently installing 4.3.11 specifically, since conda 4.3.14-16
-  # have a bug which stop them intalling anything on travis (see
-  #     https://github.com/conda/conda/issues/5033
-  # for details).
-  # This has been fixed in mewer conda versions
-  # (>=4.3.17), but the current 'latest' installer is still 4.3.14, so we need to specify the
-  # previous version. This should change in future once an installer for
-  # >=4.3.17 is released!
-  - 'if [[ ${TOXENV} == "condarecipe" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-4.3.11-Linux-x86_64.sh -O miniconda.sh; fi'
+  - 'if [[ ${TOXENV} == "condarecipe" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; fi'
   - 'if [[ ${TOXENV} == "condarecipe" ]]; then bash miniconda.sh -b -p $HOME/miniconda; fi'
   - 'if [[ ${TOXENV} == "condarecipe" ]]; then export PATH="$HOME/miniconda/bin:$PATH"; fi'
   - 'if [[ ${TOXENV} == "condarecipe" ]]; then hash -r; fi'
   - 'if [[ ${TOXENV} == "condarecipe" ]]; then conda config --set always_yes yes --set changeps1 no; fi'
   - 'if [[ ${TOXENV} == "condarecipe" ]]; then conda info -a; fi  # Useful for debugging any issues with conda'
-  # update conda, this should skip over the problematic 4.3.14-4.3.16 anyway
-  - 'if [[ ${TOXENV} == "condarecipe" ]]; then conda update conda; fi'
   - 'if [[ ${TOXENV} == "condarecipe" ]]; then conda install conda-build; fi'
-  - 'if [[ ${TOXENV} == "condarecipe" ]]; then conda info -a; fi  # Useful for debugging any issues with conda'
   - 'if [[ ${TOXENV} == "condarecipe" ]]; then conda config --append channels conda-forge; fi  # add conda-forge channel at lower priority than defaults'
   - 'if [[ ${TOXENV} == "condarecipe" ]]; then git fetch --unshallow; fi'
 install:

CHANGELOG.md

@@ -1,6 +1,7 @@
 # explicit includes
 include COPYING.rst
 include README.md
+include CHANGELOG.md
 include tox.ini
 include .bumpversion.cfg
 

MANIFEST.in

@@ -8,6 +8,10 @@ cache:
 environment:
   COVERALLS_REPO_TOKEN:
     secure: lFyaxdbvCvXKM+PjmN9FToU8DhsdS474RgaW/bNAu4IBnn7QbfZzDYrjKw33V6Oo
+  global:
+    # lxml will not build appropriately from source on Windows without the
+    # appropriate libxml headers. As a result, make pip use binary packages.
+    PIP_ONLY_BINARY: lxml
   matrix:
 
     - TOXENV: 'py27-notebook'
@@ -39,13 +43,13 @@ environment:
       PYTHON_HOME: C:\Python34
       PYTHON_VERSION: '3.4'
       PYTHON_ARCH: '32'
-    
+
     - TOXENV: 'py34-notebook43'
       TOXPYTHON: C:\Python34\python.exe
       PYTHON_HOME: C:\Python34
       PYTHON_VERSION: '3.4'
       PYTHON_ARCH: '32'
-    
+
     - TOXENV: 'py34-notebook44'
       TOXPYTHON: C:\Python34\python.exe
       PYTHON_HOME: C:\Python34

README.md

@@ -12,27 +12,27 @@ source:
 
 build:
   number: {{ GIT_DESCRIBE_NUMBER }}
-  script: python setup.py install --single-version-externally-managed --record=record.txt
+  script: pip install --no-deps .
 
 requirements:
   build:
     - python
-    - setuptools
+    - pip
 
   run:
     - python
     - ipython_genutils
-    - jupyter_contrib_core >=0.3
+    - jupyter_contrib_core >=0.3.3
     - jupyter_core
     - jupyter_highlight_selected_word >=0.0.10
     - jupyter_latex_envs >=1.3.8
-    - jupyter_nbextensions_configurator >=0.2.4
+    - jupyter_nbextensions_configurator >=0.4.0
     - nbconvert >=4.2
     - notebook >=4.0
     - pyyaml
-    - setuptools
     - tornado
     - traitlets >=4.1
+    - lxml >=3.8.0
 
 test:
   imports:

appveyor.yml

@@ -1,7 +1,7 @@
 ipython
 jupyter_highlight_selected_word>=0.0.5
 jupyter_latex_envs>=1.3.4
-jupyter_nbextensions_configurator
+jupyter_nbextensions_configurator>=0.2.8
 readthedocs-sphinx-ext
 recommonmark>=0.4.0
 sphinx>=1.3.6,<1.6

conda.recipe/meta.yaml

@@ -41,9 +41,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.2.8'
+version = '0.4.0'
 # The full version, including alpha/beta/rc tags.
-release = '0.2.8'
+release = '0.4.0'
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of strings
@@ -85,6 +85,10 @@
 
 suppress_warnings = ['image.nonlocal_uri']
 
+# don't check for the existence of anchors, since on e.g. github's rendered
+# markdown, the anchors are constructed by the rendering javascript, and
+# therefore not present in the initial response
+linkcheck_anchors = False
 # regex patterns for the beginning of links not to check
 linkcheck_ignore = [
     r'https?://(localhost|127\.0\.0\.1):\d+/',  # local links

docs/requirements.txt

@@ -21,6 +21,12 @@ Generic documentation for preprocessors can be found at
 `nbconvert.readthedocs.io/en/latest/api/preprocessors.html <http://nbconvert.readthedocs.io/en/latest/api/preprocessors.html>`__.
 
 
+Executing and updating timing metadata
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. autoclass:: ExecuteTimePreprocessor
+
+
 Retaining Codefolding
 ^^^^^^^^^^^^^^^^^^^^^