提交 26dc865a authored 作者: Oscar Gustafsson's avatar Oscar Gustafsson 提交者: Brandon T. Willard

Updated versioneer and removed some Python 2 and 3.6 support.

versioneer must be rerun to support Python 3.11. At the same time, the support for Python 3.6 was further reduced and also some odd Python 2.7-leftovers removed.
上级 02c9382b
...@@ -14,7 +14,7 @@ help: ...@@ -14,7 +14,7 @@ help:
conda: # Set up a conda environment for development. conda: # Set up a conda environment for development.
@printf "Creating conda environment...\n" @printf "Creating conda environment...\n"
${CONDA} create --yes --name ${PROJECT_NAME}-env python=3.6 ${CONDA} create --yes --name ${PROJECT_NAME}-env python=3.9
( \ ( \
${CONDA} activate ${PROJECT_NAME}-env; \ ${CONDA} activate ${PROJECT_NAME}-env; \
${PIP} install -U pip; \ ${PIP} install -U pip; \
......
差异被折叠。
# import aesara.tensor.basic as aet
from aesara.configdefaults import config from aesara.configdefaults import config
from aesara.graph.op import COp from aesara.graph.op import COp
from aesara.graph.opt import in2out from aesara.graph.opt import in2out
from aesara.graph.params_type import ParamsType from aesara.graph.params_type import ParamsType
from aesara.scalar import bool as bool_t from aesara.scalar import bool as bool_t
# Work-around for Python 3.6 issue that prevents `import aesara.tensor as aet`
from aesara.tensor import basic as aet from aesara.tensor import basic as aet
from aesara.tensor.blas import ( from aesara.tensor.blas import (
Gemv, Gemv,
......
...@@ -28,8 +28,6 @@ from aesara.graph.op import COp, Op ...@@ -28,8 +28,6 @@ from aesara.graph.op import COp, Op
from aesara.graph.opt import copy_stack_trace, local_optimizer, optimizer from aesara.graph.opt import copy_stack_trace, local_optimizer, optimizer
from aesara.raise_op import Assert from aesara.raise_op import Assert
from aesara.scalar import UnaryScalarOp from aesara.scalar import UnaryScalarOp
# Work-around for Python 3.6 issue that prevents `import aesara.tensor as aet`
from aesara.tensor import basic as aet from aesara.tensor import basic as aet
from aesara.tensor import extra_ops, math_opt from aesara.tensor import extra_ops, math_opt
from aesara.tensor.basic import ARange, as_tensor_variable from aesara.tensor.basic import ARange, as_tensor_variable
......
...@@ -50,10 +50,6 @@ class _tensor_py_operators: ...@@ -50,10 +50,6 @@ class _tensor_py_operators:
rval._is_nonzero = False rval._is_nonzero = False
return rval return rval
def __nonzero__(self):
# Python 2.x
return self.__bool__()
def __bool__(self): def __bool__(self):
# This is meant to prohibit stuff like a < b < c, which is internally # This is meant to prohibit stuff like a < b < c, which is internally
# implemented as (a < b) and (b < c). The trouble with this is the # implemented as (a < b) and (b < c). The trouble with this is the
......
...@@ -15,15 +15,16 @@ Requirements ...@@ -15,15 +15,16 @@ Requirements
.. _skcuda: http://scikit-cuda.readthedocs.io/en/latest/ .. _skcuda: http://scikit-cuda.readthedocs.io/en/latest/
.. _warp-ctc: https://github.com/baidu-research/warp-ctc .. _warp-ctc: https://github.com/baidu-research/warp-ctc
Python_ == 2.7* or ( >= 3.4 and < 3.6 ) Python_ == >= 3.7
|PythonDistRecommended|. Python 2.4 was supported up to and including the |PythonDistRecommended|. Python 2.4 was supported up to and including the
release 0.6. Python 2.6 was supported up to and including the release 0.6. Python 2.6 was supported up to and including the
release 0.8.2. Python 3.3 was supported up to and including release 0.9. release 0.8.2. Python 3.3 was supported up to and including release 0.9.
Python 3.6 was supported up to and including release 2.3.4.
`NumPy <http://numpy.scipy.org/>`_ >= 1.9.1 <= 1.12 `NumPy <http://numpy.scipy.org/>`_ >= 1.9.1
Earlier versions could work, but we dont test it. Earlier versions could work, but we dont test it.
`SciPy <http://scipy.org>`_ >= 0.14 < 0.17.1 `SciPy <http://scipy.org>`_ >= 0.14
Only currently required for sparse matrix and special functions support, but highly recommended. SciPy >=0.8 could work, but earlier versions have known bugs with sparse matrices. Only currently required for sparse matrix and special functions support, but highly recommended. SciPy >=0.8 could work, but earlier versions have known bugs with sparse matrices.
`BLAS`_ installation (with Level 3 functionality) `BLAS`_ installation (with Level 3 functionality)
......
...@@ -360,7 +360,6 @@ shows how to print all inputs and outputs: ...@@ -360,7 +360,6 @@ shows how to print all inputs and outputs:
.. testcode:: .. testcode::
from __future__ import print_function
import aesara import aesara
def inspect_inputs(fgraph, i, node, fn): def inspect_inputs(fgraph, i, node, fn):
......
...@@ -460,7 +460,6 @@ corresponding to the random number generation process (i.e. RandomFunction{unifo ...@@ -460,7 +460,6 @@ corresponding to the random number generation process (i.e. RandomFunction{unifo
An example of how "random states" can be transferred from one aesara function An example of how "random states" can be transferred from one aesara function
to another is shown below. to another is shown below.
>>> from __future__ import print_function
>>> import aesara >>> import aesara
>>> import numpy >>> import numpy
>>> import aesara.tensor as aet >>> import aesara.tensor as aet
......
-e ./ -e ./
dataclasses>=0.7; python_version < '3.7'
filelock filelock
flake8==3.8.4 flake8>=3.8.4
pep8 pep8
pyflakes pyflakes
black==20.8b1; platform.python_implementation!='PyPy' black>=20.8b1
pytest-cov>=2.6.1 pytest-cov>=2.6.1
coverage>=5.1 coverage>=5.1
pytest pytest
...@@ -12,8 +11,8 @@ coveralls ...@@ -12,8 +11,8 @@ coveralls
cython cython
sympy sympy
versioneer versioneer
jax; python_version > '3.6' jax
jaxlib; python_version > '3.6' jaxlib
numba numba
numba-scipy>=0.3.0 numba-scipy>=0.3.0
diff-cover diff-cover
......
#!/usr/bin/env python #!/usr/bin/env python
import os import os
import sys
from setuptools import find_packages, setup from setuptools import find_packages, setup
...@@ -39,7 +38,6 @@ Operating System :: POSIX ...@@ -39,7 +38,6 @@ Operating System :: POSIX
Operating System :: Unix Operating System :: Unix
Operating System :: MacOS Operating System :: MacOS
Programming Language :: Python :: 3 Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.9
...@@ -57,9 +55,6 @@ install_requires = [ ...@@ -57,9 +55,6 @@ install_requires = [
] ]
if sys.version_info[0:2] < (3, 7):
install_requires += ["dataclasses"]
# Handle builds of nightly release # Handle builds of nightly release
if "BUILD_AESARA_NIGHTLY" in os.environ: if "BUILD_AESARA_NIGHTLY" in os.environ:
nightly = True nightly = True
......
差异被折叠。
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论