Merge pull request #1147 from bdevans/remove_python2

Remove Python 2 support

Author: mstimberg

.travis.yml

@@ -46,62 +46,22 @@ matrix:
     - python: "3.7"
       env: PYTHON="3.7" STANDALONE=no CYTHON=yes MINIMAL_VERSIONS=no  REPORT_COVERAGE=no CONDA_PY="37" DO_CONDA_BUILD='no' SPLIT_RUN=2 ARCHITECTURE="x86_64" FLOAT_DTYPE_32=yes
       os: osx
-    - python: "2.7"
-      env: PYTHON="2.7" STANDALONE=no CYTHON=yes MINIMAL_VERSIONS=yes REPORT_COVERAGE=no  SPLIT_RUN=1 ARCHITECTURE="x86_64"
-      os: linux
-    - python: "2.7"
-      env: PYTHON="2.7" STANDALONE=no CYTHON=yes MINIMAL_VERSIONS=yes REPORT_COVERAGE=no  SPLIT_RUN=2 ARCHITECTURE="x86_64"
-      os: linux
-    - python: "2.7"
-      env: PYTHON="2.7" STANDALONE=no CYTHON=yes MINIMAL_VERSIONS=yes REPORT_COVERAGE=no  SPLIT_RUN=1 ARCHITECTURE="x86_64" FLOAT_DTYPE_32=yes
-      os: linux
-    - python: "2.7"
-      env: PYTHON="2.7" STANDALONE=no CYTHON=yes MINIMAL_VERSIONS=yes REPORT_COVERAGE=no  SPLIT_RUN=2 ARCHITECTURE="x86_64" FLOAT_DTYPE_32=yes
-      os: linux
-    - python: "2.7"
-      env: PYTHON="2.7" STANDALONE=no CYTHON=yes MINIMAL_VERSIONS=no  REPORT_COVERAGE=no  CONDA_PY="27" DO_CONDA_BUILD='yes' SPLIT_RUN=1 ARCHITECTURE="x86_64"
-      os: linux
-    - python: "2.7"
-      env: PYTHON="2.7" STANDALONE=no CYTHON=yes MINIMAL_VERSIONS=no  REPORT_COVERAGE=no  CONDA_PY="27" DO_CONDA_BUILD='no' SPLIT_RUN=2 ARCHITECTURE="x86_64"
-      os: linux
-    - python: "2.7"
-      env: PYTHON="2.7" STANDALONE=no CYTHON=yes MINIMAL_VERSIONS=no  REPORT_COVERAGE=no  CONDA_PY="27" DO_CONDA_BUILD='yes' SPLIT_RUN=1 ARCHITECTURE="x86_64"
-      os: osx
-    - python: "2.7"
-      env: PYTHON="2.7" STANDALONE=no CYTHON=yes MINIMAL_VERSIONS=no  REPORT_COVERAGE=no  CONDA_PY="27" DO_CONDA_BUILD='no' SPLIT_RUN=2 ARCHITECTURE="x86_64"
-      os: osx
     # test standalone
     - python: "3.7"
       env: PYTHON="3.7" STANDALONE=yes CYTHON=yes MINIMAL_VERSIONS=no REPORT_COVERAGE=yes DO_CONDA_BUILD='no' ARCHITECTURE="x86_64"
       os: linux
     - python: "3.7"
       env: PYTHON="3.7" STANDALONE=yes CYTHON=yes MINIMAL_VERSIONS=no REPORT_COVERAGE=yes DO_CONDA_BUILD='no' ARCHITECTURE="x86_64" FLOAT_DTYPE_32=yes
       os: linux
-    - python: "2.7"
-      env: PYTHON="2.7" STANDALONE=yes CYTHON=yes MINIMAL_VERSIONS=no REPORT_COVERAGE=no DO_CONDA_BUILD='no' ARCHITECTURE="x86_64"
-      os: linux
-
-jobs:
-  allow_failures:
-    - python: "2.7"
-      os: osx
 
 # Use miniconda to install binary versions of numpy etc. from continuum
 # analytic's repository. Follows an approach described by Dan Blanchard:
 # https://gist.github.com/dan-blanchard/7045057
 before_install:
-- if [ ${PYTHON:0:1} == "2" ]; then
-    if [ "$TRAVIS_OS_NAME" == "linux" ]; then
-    travis_retry wget http://repo.continuum.io/miniconda/Miniconda2-latest-Linux-$ARCHITECTURE.sh -O miniconda.sh;
-    else
-    travis_retry wget http://repo.continuum.io/miniconda/Miniconda2-latest-MacOSX-$ARCHITECTURE.sh -O miniconda.sh;
-    fi;
-    else
-    if [ "$TRAVIS_OS_NAME" == "linux" ]; then
+- if [ "$TRAVIS_OS_NAME" == "linux" ]; then
     travis_retry wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-$ARCHITECTURE.sh -O miniconda.sh;
-    else
+  else
     travis_retry wget http://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-$ARCHITECTURE.sh -O miniconda.sh;
-    fi;
   fi
 - chmod +x miniconda.sh
 # When we are installing the 32 Bit conda on a 64 Bit system, the miniconda
@@ -122,20 +82,11 @@ install:
        conda install --yes --quiet anaconda-client conda-build jinja2;
     fi
   - if [[ $MINIMAL_VERSIONS == 'yes' ]]; then
-    PYTHON_PACKAGES="python=$PYTHON numpy==1.10 scipy==0.16 libgfortran==1 pytest pytest-xdist sphinx==1.8 ipython sympy==1.2 jinja2==2.7 pyparsing setuptools coverage gsl>1.15 cython future";
-    else
-    PYTHON_PACKAGES="python=$PYTHON numpy pytest pytest-xdist sphinx>=1.8 ipython sympy>=1.2 pyparsing jinja2 setuptools coverage gsl>1.15 cython future";
-    fi
-  # On Python 2: Install the weave package explicitly
-  - if [ ${PYTHON:0:1} == "2" ]; then
-      if [[ $MINIMAL_VERSIONS != 'yes' ]]; then
-        PYTHON_PACKAGES="$PYTHON_PACKAGES weave scipy";
-      fi;
-      PYTHON_PACKAGES="$PYTHON_PACKAGES bsddb";
-      conda config --set restore_free_channel true;
+    PYTHON_PACKAGES="python=$PYTHON numpy==1.10 scipy==0.16 libgfortran==1 pytest pytest-xdist sphinx==1.8 ipython sympy==1.2 jinja2==2.7 pyparsing setuptools coverage gsl>1.15 cython";
     else
-      PYTHON_PACKAGES="$PYTHON_PACKAGES scipy";
+    PYTHON_PACKAGES="python=$PYTHON numpy pytest pytest-xdist sphinx>=1.8 ipython sympy>=1.2 pyparsing jinja2 setuptools coverage gsl>1.15 cython";
     fi
+  - PYTHON_PACKAGES="$PYTHON_PACKAGES scipy";
   - if [[ $REPORT_COVERAGE == 'yes' ]]; then PYTHON_PACKAGES="$PYTHON_PACKAGES pytest-cov coveralls"; fi
   # Install packages into a new environment
   - travis_retry conda create --quiet --yes -n travis_conda $PYTHON_PACKAGES

.travis_long.yml

@@ -17,7 +17,7 @@ Stimberg, M, Brette, R, Goodman, DFM. “Brian 2, an Intuitive and Efficient Neu
 
 
 
-.. image:: https://img.shields.io/pypi/v/Brian2.svg?style=flat-square
+.. image:: https://img.shields.io/pypi/v/Brian2.svg
         :target: https://pypi.python.org/pypi/Brian2
 
 .. image:: https://img.shields.io/conda/vn/conda-forge/brian2.svg
@@ -48,22 +48,19 @@ Dependencies
 ------------
 The following packages need to be installed to use Brian 2:
 
-* Python 2.7, or >= 3.5
+* Python >= 3.5
 * NumPy >=1.10
 * SymPy >= 1.2
 * Cython >= 0.29
 * PyParsing
 * Jinja2 >= 2.7
-* future
 * setuptools >= 21
 * py-cpuinfo (only required on Windows)
 
 For full functionality, you might also want to install:
 
 * GSL >=1.16
 * SciPy >=0.13.3
-* weave (only on Python 2)
-* bsddb (only on Python 2)
 * Matplotlib >= 2.0
 
 To build the documentation:
@@ -78,13 +75,13 @@ To run the test suite:
 Testing status for master branch
 --------------------------------
 
-.. image:: https://img.shields.io/travis/brian-team/brian2/master.svg?style=flat-square
+.. image:: https://img.shields.io/travis/brian-team/brian2/master.svg
   :target: https://travis-ci.org/brian-team/brian2?branch=master
 
-.. image:: https://img.shields.io/appveyor/ci/brianteam/brian2/master.svg?style=flat-square
+.. image:: https://img.shields.io/appveyor/ci/brianteam/brian2/master.svg
   :target: https://ci.appveyor.com/project/brianteam/brian2/branch/master
 
-.. image:: https://img.shields.io/coveralls/brian-team/brian2/master.svg?style=flat-square
+.. image:: https://img.shields.io/coveralls/brian-team/brian2/master.svg
   :target: https://coveralls.io/r/brian-team/brian2?branch=master
 
 .. image:: https://readthedocs.org/projects/brian2/badge/?version=stable

README.rst

@@ -21,24 +21,6 @@ environment:
       platform: x86
       STANDALONE: "TRUE"
 
-    - PYTHON: "C:\\Miniconda"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "32"
-      platform: x86
-      STANDALONE: "FALSE"
-      CONDA_PY: "27"
-      DO_CONDA_BUILD: "TRUE"
-      SPLIT_RUN: "FALSE"
-
-    - PYTHON: "C:\\Miniconda-x64"
-      PYTHON_VERSION: "2.7"
-      PYTHON_ARCH: "64"
-      platform: x64
-      STANDALONE: "FALSE"
-      CONDA_PY: "27"
-      DO_CONDA_BUILD: "TRUE"
-      SPLIT_RUN: "FALSE"
-
     - PYTHON: "C:\\Miniconda37"
       PYTHON_VERSION: "3.7"
       PYTHON_ARCH: "32"
@@ -109,11 +91,7 @@ install:
   - 'conda config --append channels conda-forge'
   # Install the build dependencies of the project via conda
   - 'appveyor-retry conda update -c conda-forge --yes conda'
-  - 'set PYTHON_PACKAGES=pytest "sympy>=1.1.1" pyparsing jinja2 ipython setuptools cython "py-cpuinfo>=3" "gsl>1.15" future sphinx'
-  # Install the weave package for Python 2
-  - 'if "%PYTHON_VERSION:~0,1%" == "2" set PYTHON_PACKAGES=%PYTHON_PACKAGES% weave'
-  # weave 0.16 is the only available version for 32 bit Windows, and it is not compatible with numpy 0.16
-  - 'if "%platform%" == "x86" (set PYTHON_PACKAGES=%PYTHON_PACKAGES% "numpy<1.16") else (set PYTHON_PACKAGES=%PYTHON_PACKAGES% numpy)'
+  - 'set PYTHON_PACKAGES=pytest "sympy>=1.1.1" pyparsing jinja2 ipython setuptools cython "py-cpuinfo>=3" "gsl>1.15" sphinx numpy'
   # Create the test environment
   - 'appveyor-retry conda install --quiet --yes python=%PYTHON_VERSION% %PYTHON_PACKAGES%'
   # For faster tests, only build conda packages for the master branch or pull requests

appveyor.yml

@@ -1,11 +1,6 @@
 '''
 Brian 2
 '''
-# Import setuptools to do some monkey patching of distutils, necessary for
-# working weave/Cython on Windows with the Python for C++ compiler
-from __future__ import absolute_import
-import setuptools as _setuptools
-from past.builtins import basestring
 
 
 def _check_dependencies():
@@ -80,7 +75,7 @@ def _check_dependency_version(name, version):
     logger = get_logger(__name__)
 
     module = sys.modules[name]
-    if not isinstance(module.__version__, basestring):  # mocked module
+    if not isinstance(module.__version__, str):  # mocked module
         return
     if not LooseVersion(module.__version__) >= LooseVersion(version):
         message = '%s is outdated (got version %s, need version %s)' % (name,
@@ -150,7 +145,7 @@ def clear_cache(target):
     Parameters
     ----------
     target : str
-        The code generation target (e.g. ``'weave'`` or ``'cython'``)
+        The code generation target (e.g. ``'cython'``)
 
     Raises
     ------
@@ -186,13 +181,10 @@ def clear_cache(target):
 
 
 def _check_caches():
-    from brian2.codegen.runtime.weave_rt.weave_rt import get_weave_cache_dir
     from brian2.codegen.runtime.cython_rt.extension_manager import get_cython_cache_dir
-    from brian2.codegen.runtime.weave_rt.weave_rt import get_weave_extensions
     from brian2.codegen.runtime.cython_rt.extension_manager import get_cython_extensions
 
-    for target, (dirname, extensions) in [('weave', (get_weave_cache_dir(), get_weave_extensions())),
-                                          ('cython', (get_cython_cache_dir(), get_cython_extensions()))]:
+    for target, (dirname, extensions) in [('cython', (get_cython_cache_dir(), get_cython_extensions()))]:
         _cache_dirs_and_extensions[target] = (dirname, extensions)
         if prefs.codegen.max_cache_dir_size > 0:
             check_cache(target)

brian2/__init__.py

@@ -2,9 +2,9 @@
 Package providing the code generation framework.
 '''
 # Import the runtime packages so that they can register their preferences
-from __future__ import absolute_import
+
 from .runtime import *
 from . import _prefs
 from . import cpp_prefs as _cpp_prefs
 
-__all__ = ['NumpyCodeObject', 'WeaveCodeObject', 'CythonCodeObject']
+__all__ = ['NumpyCodeObject', 'CythonCodeObject']

brian2/codegen/__init__.py

@@ -1,13 +1,11 @@
-from __future__ import absolute_import
+
 '''
 Module declaring general code generation preferences.
 
 Preferences
 -----------
 .. document_brian_prefs:: codegen
 '''
-from past.builtins import basestring
-
 from brian2.core.preferences import prefs, BrianPreference
 from .codeobject import CodeObject
 
@@ -24,17 +22,14 @@
         
         * ``'auto'`` the default, automatically chose the best code generation
           target available.
-        * ``'weave'`` uses ``scipy.weave`` to generate and compile C++ code,
-          should work anywhere where ``gcc`` is installed and available at the
-          command line.
         * ``'cython'``, uses the Cython package to generate C++ code. Needs a
           working installation of Cython and a C++ compiler.
         * ``'numpy'`` works on all platforms and doesn't need a C compiler but
           is often less efficient.
         
         Or it can be a ``CodeObject`` class.
         ''',
-        validator=lambda target: isinstance(target, basestring) or issubclass(target, CodeObject),
+        validator=lambda target: isinstance(target, str) or issubclass(target, CodeObject),
         ),
     string_expression_target=BrianPreference(
         default='numpy',
@@ -46,7 +41,7 @@
 
         Accepts the same arguments as `codegen.target`, except for ``'auto'``
         ''',
-        validator=lambda target: isinstance(target, basestring) or issubclass(target, CodeObject),
+        validator=lambda target: isinstance(target, str) or issubclass(target, CodeObject),
         ),
     loop_invariant_optimisations=BrianPreference(
         default=True,
@@ -61,7 +56,7 @@
     max_cache_dir_size=BrianPreference(
       default=1000,
       docs='''
-      The size of a directory (in MB) with cached code for weave or Cython that triggers a warning.
+      The size of a directory (in MB) with cached code for Cython that triggers a warning.
       Set to 0 to never get a warning.
       '''
     )

brian2/codegen/_prefs.py

@@ -1,7 +1,7 @@
 '''
 Module providing the base `CodeObject` and related functions.
 '''
-from __future__ import absolute_import
+
 import collections
 import copy
 import platform