Skip to content

Commit

Permalink
Merge pull request #312 from python-adaptive/python37
Browse files Browse the repository at this point in the history
bump to Python≥3.7
  • Loading branch information
basnijholt authored Mar 23, 2021
2 parents 2d0444b + 073b848 commit 1e3d26a
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
fail-fast: false
matrix:
platform: [ubuntu-latest, macos-latest, windows-latest]
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: [3.7, 3.8, 3.9]

steps:
- uses: actions/checkout@v1
Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ repos:
hooks:
- id: black
- repo: https://github.com/asottile/pyupgrade
rev: v2.10.0
rev: v2.11.0
hooks:
- id: pyupgrade
args: ['--py36-plus']
args: ['--py37-plus']
- repo: https://github.com/timothycrosley/isort
rev: 5.7.0
rev: 5.8.0
hooks:
- id: isort
- repo: https://gitlab.com/pycqa/flake8
rev: 3.8.4
rev: 3.9.0
hooks:
- id: flake8
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ Adaptively learning a 1D function (the `gif` below) and live-plotting the proces
Installation
------------

``adaptive`` works with Python 3.6 and higher on Linux, Windows, or Mac,
``adaptive`` works with Python 3.7 and higher on Linux, Windows, or Mac,
and provides optional extensions for working with the Jupyter/IPython
Notebook.

Expand Down
2 changes: 1 addition & 1 deletion benchmarks/asv.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"environment_type": "conda",
"install_timeout": 600,
"show_commit_url": "https://github.com/python-adaptive/adaptive/commits/",
"pythons": ["3.6"],
"pythons": ["3.7"],
"conda_channels": ["conda-forge"],
"matrix": {
"numpy": ["1.13"],
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
- conda-forge

dependencies:
- python=3.6
- python=3.7
- sortedcontainers
- sortedcollections
- scipy
Expand Down
8 changes: 4 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

from setuptools import find_packages, setup

if sys.version_info < (3, 6):
print("adaptive requires Python 3.6 or above.")
if sys.version_info < (3, 7):
print("adaptive requires Python 3.7 or above.")
sys.exit(1)


Expand Down Expand Up @@ -65,17 +65,17 @@ def get_version_and_cmdclass(package_name):
name="adaptive",
description="Parallel active learning of mathematical functions",
version=version,
python_requires=">=3.6",
python_requires=">=3.7",
url="https://adaptive.readthedocs.io/",
author="Adaptive authors",
license="BSD",
classifiers=[
"Development Status :: 4 - Beta",
"License :: OSI Approved :: BSD License",
"Intended Audience :: Science/Research",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
],
packages=find_packages("."),
install_requires=install_requires,
Expand Down

0 comments on commit 1e3d26a

Please sign in to comment.