Merge branch 'master' into dcsolvers

Author: sbanert

.gitignore

@@ -1,3 +1,38 @@
+## Custom stuff
+
+# vim viles
+*.swp
+*.swo
+*~
+
+# Spyder project files
+.spyproject/
+.spyderproject
+.spyderworkspace
+.spyproject/
+
+# PyCharm project files
+.idea
+
+# VS Code files
+.vscode/
+
+# IPython / Jupyter notebook files
+*.ipynb
+.ipynb_checkpoints
+
+# caches
+.pytest_cache/
+
+# Sphinx documentation
+doc/_build/
+doc/source/generated
+doc/source/odl_interface
+doc/source/odl*.rst
+
+
+## Python
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -51,46 +86,18 @@ coverage.xml
 # Django stuff:
 *.log
 
-# Sphinx documentation
-doc/_build/
-doc/source/generated
-doc/source/odl_interface
-doc/source/odl*.rst
-
 # PyBuilder
 target/
 
 # Backups from futurize/pasteurize
 *.py.bak
 
-# Visual studio
+
+## Visual studio
 *.sdf
 *.sln
 *.suo
 *.pyproj
 *.pyproj.user
 *.pyperf
 *.psess
-
-# vim viles
-*.swp
-*.swo
-*~
-
-# Spyder project files
-.spyproject/
-.spyderproject
-.spyderworkspace
-.spyproject/
-
-# PyCharm project files
-.idea
-
-# VS Code files
-.vscode/
-
-# IPython / Jupyter notebook files
-*.ipynb
-.ipynb_checkpoints
-
-# Documentation build files

.pep8speaks.yml

@@ -14,6 +14,7 @@ pycodestyle:
     show-source: True
     ignore:  # Errors and warnings to ignore
         - E402
+        - E741
 
 no_blank_comment: False
 only_mention_files_with_errors: True

.travis.yml

@@ -5,6 +5,9 @@ matrix:
         - python: 2.7
           env: NUMPY_VERSION=1.13
 
+        - python: 3.6
+          env: NUMPY_VERSION=1.10.1
+
         - python: 3.6
           env: NUMPY_VERSION=1.12
 
@@ -46,13 +49,14 @@ install:
     # make it run faster and avoid downloading big stuff like mkl
     - conda create -n testenv python=$TRAVIS_PYTHON_VERSION nomkl pywavelets
     - source activate testenv
-    # We avoid annoying issues with building pyfftw wheels by using a conda-forge version
-    - pip install "numpy==$NUMPY_VERSION" scipy future scikit-image pytest pytest-cov  # faster than conda
-    - conda install -c conda-forge pyfftw  # compilation sometimes breaks on pip, using conda therefore
+    # Install packages with pip if possible, it's way faster
+    - pip install "numpy==$NUMPY_VERSION" scipy future scikit-image pytest pytest-cov;
+    # Building pyfftw wheels sometimes fails, using a conda-forge version instead
+    - conda install -c conda-forge pyfftw
 
     # Doc dependencies
     - if [[ "$BUILD_DOCS" == "true" ]]; then
-        pip install "sphinx<1.7" sphinx_rtd_theme travis-sphinx;
+        pip install "sphinx>=1.7" sphinx_rtd_theme "travis-sphinx>=2.1.2";
       fi
 
     # Install our package

conda/meta.yaml

@@ -19,13 +19,13 @@ requirements:
         - setuptools
         - nomkl # [not win]
         - future >=0.14
-        - numpy >=1.9
+        - numpy >=1.10
         - scipy >=0.14
     run:
         - python
         - future >=0.14
         - nomkl # [not win]
-        - numpy >=1.9
+        - numpy >=1.10
         - scipy >=0.14
         - matplotlib
         - pytest >=3.0.3

doc/source/dev/gitwash/git_links.inc

@@ -56,7 +56,7 @@
 
 .. other stuff
 .. _Python: http://www.python.org
-.. _acronym: http://docs.scipy.org/doc/numpy-dev/dev/gitwash/development_workflow.html#writing-the-commit-message
+.. _acronym: http://www.numpy.org/devdocs/dev/gitwash/development_workflow.html#writing-the-commit-message
 
 .. |emdash| unicode:: U+02014