Skip to content

Commit

Permalink
fixes #165 fixes #166: sunset 3.6
Browse files Browse the repository at this point in the history
  • Loading branch information
mmckerns committed Feb 21, 2022
1 parent 4459386 commit 08c73d9
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 18 deletions.
12 changes: 2 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,13 @@ matrix:
env:
- COVERAGE="true"

- python: '3.6'
- python: '3.7'
env:
- COVERAGE="true"
- MATPLOTLIB="true"
- SYMPY="true"
- SCIPY="true"

- python: '3.7'
env:

- python: '3.8'
env:

Expand All @@ -36,11 +33,6 @@ matrix:
dist: xenial
env:

- python: 'pypy3.6-7.3.3' # most recent
dist: bionic
env:
- SYMPY="true" # SyntaxError with 1.10rc1

- python: 'pypy3.7-7.3.5' # most recent
dist: bionic
env:
Expand All @@ -58,7 +50,7 @@ before_install:
- set -e # fail on any error
- if [[ $COVERAGE == "true" ]]; then pip install coverage; fi
- if [[ $MATPLOTLIB == "true" ]]; then pip install matplotlib; fi
- if [[ $SYMPY == "true" ]]; then pip install "sympy<1.10a0"; fi #FIXME
- if [[ $SYMPY == "true" ]]; then pip install sympy; fi
- if [[ $SCIPY == "true" ]]; then pip install scipy; fi
- if [[ $CYTHON == "true" ]]; then pip install "cython<0.29.25"; fi #FIXME

Expand Down
7 changes: 3 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
unsupported = None
if sys.version_info < (2, 7):
unsupported = 'Versions of Python before 2.7 are not supported'
elif (3, 0) <= sys.version_info < (3, 6):
unsupported = 'Versions of Python before 3.6 are not supported'
elif (3, 0) <= sys.version_info < (3, 7):
unsupported = 'Versions of Python before 3.7 are not supported'
if unsupported:
raise ValueError(unsupported)

Expand Down Expand Up @@ -175,7 +175,7 @@
``mystic`` requires:
- ``python`` (or ``pypy``), **version == 2.7** or **version >= 3.6**
- ``python`` (or ``pypy``), **version == 2.7** or **version >= 3.7**
- ``numpy``, **version >= 1.0**
- ``sympy``, **version >= 0.6.7**
- ``mpmath``, **version >= 0.19**
Expand Down Expand Up @@ -373,7 +373,6 @@ def write_info_py(filename='mystic/info.py'):
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
Expand Down
8 changes: 4 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ envlist =
# py33-numpy11-sympy10
# py34-numpy12-sympy10
# py35-numpy12-sympy10
py36-numpy12-sympy11
# py36-numpy12-sympy11
py37-numpy12-sympy11
py38-numpy12-sympy11
py39-numpy12-sympy11
py310-numpy12-sympy11
# pypy27-numpy12-sympy11
pypy36-numpy12-sympy11
# pypy36-numpy12-sympy11
pypy37-numpy12-sympy11
pypy38-numpy12-sympy11

Expand All @@ -27,13 +27,13 @@ basepython =
# py33: python3.3
# py34: python3.4
# py35: python3.5
py36: python3.6
# py36: python3.6
py37: python3.7
py38: python3.8
py39: python3.9
py310: python3.10
# pypy27: pypy27
pypy36: pypy36
# pypy36: pypy36
pypy37: pypy37
pypy38: pypy38
deps =
Expand Down

0 comments on commit 08c73d9

Please sign in to comment.