diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml index 004bfc08379..125cdc65a9e 100644 --- a/.github/workflows/build-test.yaml +++ b/.github/workflows/build-test.yaml @@ -19,10 +19,6 @@ jobs: dependencies: [full] tests-type: [unit] include: - - os: ubuntu-18.04 - python-version: 3.6 - dependencies: minimal - tests-type: unit - os: ubuntu-18.04 python-version: 3.7 dependencies: full diff --git a/README.md b/README.md index 2a938da78e9..bd0a475614e 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ and work within a conda environment: ``` # Create a conda environment named yt-git -$ conda create -n yt-git python=3.6 +$ conda create -n yt-git python=3.8 # Activate it $ source activate yt-git # Make sure you run the latest version of conda diff --git a/pyproject.toml b/pyproject.toml index f6c98ea7b24..853a223b51f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,17 +3,14 @@ requires = [ "setuptools>=19.6", "wheel", - - # keep in sync with travis.yml "minimal" specs (Cython and numpy for py36) "Cython>=0.26.1", - "numpy==1.13.3; python_version=='3.6' and platform_system!='AIX'", - "numpy>=1.18.4; python_version>='3.7' and platform_system!='AIX'", + "numpy>=1.18.4; platform_system!='AIX'", ] # To be kept consistent with "Code Style" section in CONTRIBUTING.rst [tool.black] line-length = 88 -target-version = ['py36', 'py37', 'py38'] +target-version = ['py37', 'py38'] include = '\.pyi?$' exclude = ''' /( diff --git a/setup.py b/setup.py index ee25ce845c9..4f90723de08 100644 --- a/setup.py +++ b/setup.py @@ -110,9 +110,6 @@ def has_ext_modules(self): "Operating System :: POSIX :: AIX", "Operating System :: POSIX :: Linux", "Programming Language :: C", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.5", - "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Topic :: Scientific/Engineering :: Astronomy", @@ -153,5 +150,5 @@ def has_ext_modules(self): scripts=["scripts/iyt"], distclass=BinaryDistribution, ext_modules=[], # !!! We override this inside build_ext above - python_requires=">=3.6", + python_requires=">=3.7", ) diff --git a/tests/ci_install.sh b/tests/ci_install.sh index 8f586e69107..d9266146396 100644 --- a/tests/ci_install.sh +++ b/tests/ci_install.sh @@ -52,6 +52,8 @@ if [[ ${dependencies} == "minimal" ]]; then # don't error out # The first numpy to support py3.6 is 1.12, but numpy 1.13 matches # unyt so we'll match it here. + + # TODO: UPDATE THIS TO TARGET PYTHON 3.7 AS MINIMAL python -m pip install numpy==1.13.3 cython==0.26.1 python -m pip install -r tests/test_minimal_requirements.txt else diff --git a/yt/__init__.py b/yt/__init__.py index 27bf862416c..6aa4793e7df 100644 --- a/yt/__init__.py +++ b/yt/__init__.py @@ -9,10 +9,9 @@ """ import sys -if sys.version_info[0] < 3: - raise Exception( - "Python 2 no longer supported. Please install Python 3 for use with yt." - ) +py_version = sys.version_info +if not (py_version.major == 3 and py_version.minor >= 7): + raise sys.exit("yt requires Python 3.7 or later.") __version__ = "4.0.dev0"