Python 3

.gitignore

@@ -61,3 +61,4 @@ coverage.xml
 libpeerconnection.log
 debian/pymor/
 .cache
+3to2.conversion.ok

.landscape.yaml

@@ -0,0 +1,16 @@
+# https://landscape.io/pages/docs 
+
+max-line-length: 120
+
+ignore-paths:
+    - distribute_setup.py
+    - graveyard
+    - src/pymor/playground/
+    - src/pymortests/
+
+strictness: low
+
+pyroma:
+  run: true
+
+autodetect: yes

.travis.yml

@@ -1,38 +1,51 @@
 language: generic
 
+git:
+  depth: 1000
+
 before_install:
- - git fetch --depth=1000 --tags origin master
- - alias python=python${TRAVIS_PYTHON_VERSION}
+ - alias python=python${PYMOR_PYTHON_VERSION}
+ - export PYTHON_X=python${PYMOR_PYTHON_VERSION}
+ # for some reason installing ptyhon-pytest does not install a /usr/bin/py.test-2.7 which we fake below
+ - export PY_TEST_X="${PYTHON_X} /usr/local/bin/py.test"
+ - export PIP_X=pip${PYMOR_PYTHON_MAJOR}
  - sudo add-apt-repository -y ppa:pymor/stable
- - sudo add-apt-repository -y ppa:fenics-packages/fenics
- - sudo apt-get update -qq
- # these are packages not on travis' whitelist/only in our ppa
- - sudo apt-get install -y -qq python-docopt python-pytest python-opengl python-distribute ipython python-pyside python-pyvtk python-mpi4py
- - for pkg in ipyparallel pytest-cov python-coveralls ; do sudo -E pip install ${pkg} ; done
+ # our exp. py3 packages are incompat. with the official repo
  # using aptitude here because it auto-fixes problems
- - sudo aptitude install -y -q dolfin-dev python-dolfin
- - python -c 'import  dolfin' || echo "import dolfin failed"
+ - |
+  if [ "${PYMOR_PYTHON_MAJOR}" == "3" ] ; then
+      sudo add-apt-repository -y ppa:pymor/fenics-py3
+      sudo aptitude update
+      sudo aptitude install -y -q libslepc3.4.2-dev libhdf5-openmpi-dev python3-zmq python3-dev python3-dolfin python3-mpi4py python3-tk cython3 python3-pip python3.4-venv python3-docopt python3-pytest python3-opengl ipython3 python3-pyside python3-mpi4py python3-sympy python3-scipy
+  else
+      sudo add-apt-repository -y ppa:fenics-packages/fenics
+      sudo aptitude update
+      sudo aptitude install -y -q libslepc3.4.2-dev libhdf5-openmpi-dev python-zmq python-dev python-dolfin python-mpi4py python2.7 python-pytest python-docopt python-pytest python-opengl python-distribute ipython python-pyside python-mpi4py
+  fi
+ - ${PYTHON_X} -c 'import  dolfin' || echo "import dolfin failed"
+ - for pkg in 3to2 https://bitbucket.org/pauloh/pyevtk/get/tip.tar.gz ipyparallel pytest-cov python-coveralls ; do sudo -E ${PIP_X} install ${pkg} ; done
+ - sudo -E ${PIP_X} install -U pytest
 
 install:
- - python setup.py build_ext -i
+ - ${PYTHON_X} setup.py build_ext -i
 
 sudo: required
 dist: trusty
 
 script:
  - |
   if [ "${PYTEST_MARKER}" == "PIP_ONLY" ] ; then
-    virtualenv piptest
+    virtualenv --python=${PYTHON_X} piptest
     source piptest/bin/activate
     # this fails on PRs, so skip it
-    [[ "${TRAVIS_PULL_REQUEST}" != "false" ]] || pip install git+https://github.com/${TRAVIS_REPO_SLUG}.git@${TRAVIS_COMMIT}
+    [[ "${TRAVIS_PULL_REQUEST}" != "false" ]] || ${PIP_X} --verbose install git+https://github.com/${TRAVIS_REPO_SLUG}.git@${TRAVIS_COMMIT}
   elif [ "${PYTEST_MARKER}" == "MPI" ] ; then
     export PYTHONPATH=$(pwd)/src
-    xvfb-run -a mpirun -n 2 python src/pymortests/mpi_run_demo_tests.py
+    xvfb-run -a mpirun -n 2 ${PYTHON_X} src/pymortests/mpi_run_demo_tests.py
   else
     export PYTHONPATH=$(pwd)/src
     # this runs in pytest in a fake, auto numbered, X Server
-    xvfb-run -a py.test -k "${PYTEST_MARKER}"
+    xvfb-run -a ${PY_TEST_X} -k "${PYTEST_MARKER}"
   fi
 
 notifications:
@@ -47,22 +60,23 @@ branches:
   except:
     - gh-pages
 
-env:
-  - PYTEST_MARKER="not slow"
-  - PYTEST_MARKER="slow"
-  - PYTEST_MARKER="PIP_ONLY"
-  - PYTEST_MARKER="MPI"
-
 addons:
   apt:
     packages:
     - debhelper
     - python-pip
     - python-markupsafe
+    - python3-markupsafe
     - git
     - cython
     - xvfb
     - libopenmpi-dev
+    - python3-numpy
+    - python3-sphinx
+    - python3-matplotlib
+    - python3-dev
+    - python3-six
+    - python-six
     - python-virtualenv
     - python-numpy
     - python-sphinx
@@ -85,3 +99,15 @@ addons:
 os:
   - linux
 
+env:
+  global: PYMOR_PYTHON_MAJOR=3 PYMOR_PYTHON_VERSION=3.4
+  matrix:
+  - PYTEST_MARKER="not slow"
+  - PYTEST_MARKER="slow"
+  - PYTEST_MARKER="PIP_ONLY"
+  - PYTEST_MARKER="MPI"
+  - PYMOR_PYTHON_MAJOR=2 PYMOR_PYTHON_VERSION=2.7 PYTEST_MARKER="not slow"
+  - PYMOR_PYTHON_MAJOR=2 PYMOR_PYTHON_VERSION=2.7 PYTEST_MARKER="slow"
+  - PYMOR_PYTHON_MAJOR=2 PYMOR_PYTHON_VERSION=2.7 PYTEST_MARKER="PIP_ONLY"
+  - PYMOR_PYTHON_MAJOR=2 PYMOR_PYTHON_VERSION=2.7 PYTEST_MARKER="MPI"
+

Makefile

@@ -22,6 +22,9 @@ flake8:
 test:
 	python setup.py test
 
+fasttest:
+	PYTEST_MARKER="not slow" python setup.py test
+
 full-test:
 	@echo
 	@echo "Ensuring that all required pytest plugins are installed ..."
@@ -37,3 +40,8 @@ full-test:
 
 doc:
 	PYTHONPATH=${PWD}/src/:${PYTHONPATH} make -C docs html
+
+3to2:
+	./3to2.sh src/
+	./3to2.sh docs/
+	python setup.py build_ext -i

debian/control

@@ -5,7 +5,7 @@ Maintainer: Rene Milk <rene.milk@uni-muenster.de>
 Build-Depends: debhelper (>= 8.0.0), python-pip, python-virtualenv, python-numpy,
   python-scipy, python-pytest, python-pyside, 
   cython, python-sphinx, python-sympy, python-matplotlib,
-  python-opengl, python-docopt, python-pyvtk, 
+  python-opengl, python-docopt, python-pyevtk,
   python-dev, python3, dh-make,
   python-docutils
 Standards-Version: 3.9.4
@@ -19,7 +19,7 @@ Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends},
   python-pip, python-virtualenv, python-numpy,
   python-scipy, python-pytest, python-pyside,
   cython, python-matplotlib, python-opengl,
-  python-docopt, python-pyvtk,
+  python-docopt, python-pyevtk,
   python-dev, python
 Suggests: python-pymor-doc
 Description: makes pyMOR importable system-wide + dependency tracking

dependencies.py

@@ -4,7 +4,7 @@
 
 tests_require = ['pytest', 'pytest-cov']
 install_requires = ['cython>=0.20.1', 'numpy>=1.8.1', 'scipy>=0.13.3', 'Sphinx', 'docopt']
-setup_requires = ['cython>=0.20.1', 'numpy>=1.8.1']
+setup_requires = ['pytest-runner', 'cython>=0.20.1', 'numpy>=1.8.1']
 install_suggests = {'ipython': 'an enhanced interactive python shell',
                     'ipyparallel': 'required for pymor.parallel.ipython',
                     'matplotlib': 'needed for error plots in demo scipts',
@@ -22,7 +22,8 @@
                 'pytest-cov': 'pytest_cov',
                 'pytest-flakes': 'pytest_flakes',
                 'pytest-pep8': 'pytest_pep8',
-                'pyopengl': 'OpenGL'}
+                'pyopengl': 'OpenGL',
+                'pyside': 'PySide'}
 
 if __name__ == '__main__':
     print(' '.join([i for i in install_requires + install_suggests]))

distribute_setup.py

@@ -194,7 +194,7 @@ def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
     try:
         from urllib.request import urlopen
     except ImportError:
-        from urllib2 import urlopen
+        from urllib.request import urlopen
     tgz_name = "distribute-%s.tar.gz" % version
     url = download_base + tgz_name
     saveto = os.path.join(to_dir, tgz_name)

docs/Makefile

@@ -3,7 +3,7 @@
 
 # You can set these variables from the command line.
 SPHINXOPTS    =
-SPHINXBUILD   = PYMOR_COPY_DOCSTRINGS_DISABLE=1 sphinx-build
+SPHINXBUILD   = sphinx-build
 PAPER         =
 BUILDDIR      = _build
 

docs/source/conf.py

@@ -5,6 +5,10 @@
 
 import sys, os, re
 
+PY2 = sys.version_info.major == 2
+
+os.environ['PYMOR_WITH_SPHINX'] = '1'
+
 # Fix documentation generation for readthedocs.org
 
 if os.environ.get('READTHEDOCS', None) == 'True':
@@ -102,7 +106,7 @@ def __getattr__(cls, name):
 
 # General substitutions.
 project = 'pyMOR'
-copyright = '2012-2015, the pyMOR AUTHORS'
+copyright = '2012-2016, the pyMOR AUTHORS'
 
 # The default replacements for |version| and |release|, also used in various
 # other places throughout the built documents.
@@ -111,7 +115,7 @@ def __getattr__(cls, name):
 
 # The full version, including alpha/beta/rc tags.
 release = version.split('-')[0]
-print version, release
+print(version, release)
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
@@ -277,7 +281,7 @@ def __getattr__(cls, name):
 
 # autodoc_default_flags = ['members', 'undoc-members', 'show-inheritance']
 
-intersphinx_mapping = {'python': ('http://docs.python.org/2.7', None),
+intersphinx_mapping = {'python': ('http://docs.python.org/' + ('2.7' if PY2 else '3'), None),
                        'numpy': ('http://docs.scipy.org/doc/numpy', None),
                        'scipy': ('http://docs.scipy.org/doc/scipy/reference', None)}
 

docs/source/environment.rst

@@ -15,12 +15,9 @@ PYMOR_CACHE_DISABLE
 PYMOR_COLORS_DISABLE
     If ``1``, disable coloring of logging output.
 
-PYMOR_COPY_DOCSTRINGS_DISABLE 
-    By default, docstrings of methods in base classes are copied
-    to overriding methods, if these do not define their own
-    docstring. Setting this variable to `1` disables this feature.
-    (We use this for when auto-generating API-documentation with
-    sphinx.)
+PYMOR_WITH_SPHINX
+    This variable is set to `1` during API documentation generation
+    using sphinx.
 
 PYMOR_DEFAULTS
     If empty or ``NONE``, do not load any :mod:`~pymor.core.defaults`

docs/source/gen_apidoc.py

@@ -2,8 +2,6 @@
 # Copyright 2013-2016 pyMOR developers and contributors. All rights reserved.
 # License: BSD 2-Clause License (http://opensource.org/licenses/BSD-2-Clause)
 
-from __future__ import print_function
-
 from types import FunctionType
 
 import pkgutil
@@ -29,7 +27,7 @@ def walk(module):
             modules.append(module.__name__ + '.' + modname)
     modules = sorted(modules)
     packages = sorted(packages)
-    with open('{}/{}.rst'.format(BUILD_DIR, module.__name__), 'wb') as f:
+    with open('{}/{}.rst'.format(BUILD_DIR, module.__name__), 'wt') as f:
         print(section('{} package'.format(module.__name__)), file=f)
 
         print('.. automodule:: ' + module.__name__, file=f)
@@ -53,7 +51,7 @@ def walk(module):
                     print('    ' + option, file=f)
                 print('', file=f)
                 module = __import__(m, fromlist='none')
-                for k, v in sorted(module.__dict__.iteritems()):
+                for k, v in sorted(module.__dict__.items()):
                     if isinstance(v, (type, FunctionType)) and v.__module__ == m:
                         if v.__name__.startswith('_') and not v.__doc__:
                             continue