Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop support for Python 3.6 #1200

Merged
merged 9 commits into from
Jul 30, 2021
Merged

Drop support for Python 3.6 #1200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
386d590
remove support for python 36
valeriupredoi Jun 28, 2021
4189d26
remove support for python 36
valeriupredoi Jun 28, 2021
201e9be
remove support for python 36
valeriupredoi Jun 28, 2021
e7a65a0
remove support for python 36
valeriupredoi Jun 28, 2021
2012ebf
drop python 36 from GA tests
valeriupredoi Jun 28, 2021
c1651b1
Merge branch 'main' into remove_python36
valeriupredoi Jul 19, 2021
c673cfa
Fix test
bouweandela Jul 30, 2021
2dc1d19
Allow both kinds of exceptions
bouweandela Jul 30, 2021
24a0249
Try again
bouweandela Jul 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/recipe/preprocessor.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Overview
========

..
ESMValTool is a modular ``Python 3.6+`` software package possessing capabilities
ESMValTool is a modular ``Python 3.7+`` software package possessing capabilities
of executing a large number of diagnostic routines that can be written in a
number of programming languages (Python, NCL, R, Julia). The modular nature
benefits the users and developers in different key areas: a new feature
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ dependencies:
- esmpy
- iris>=3.0.2 # bump to latest to have a number of bugfixes available
- graphviz
- python>=3.6
- python>=3.7
- python-stratify
- scipy<1.6 # until ESMValGroup/ESMValCore/issues/927 gets resolved
4 changes: 2 additions & 2 deletions package/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ build:
requirements:
build:
- git
- python>=3.6
- python>=3.7
# Normally installed via pip:
- pytest-runner
- setuptools_scm
run:
# esmvaltool
- python>=3.6
- python>=3.7
- graphviz
- iris>=3.0.2
- python-stratify
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,9 @@ def read_description(filename):
'Natural Language :: English',
'Operating System :: POSIX :: Linux',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Topic :: Scientific/Engineering',
'Topic :: Scientific/Engineering :: Atmospheric Science',
'Topic :: Scientific/Engineering :: GIS',
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/preprocessor/_io/test_concatenate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ def test_fail_on_calendar_concatenate_with_overlap(self):
Cube([33., 55.],
var_name='sample',
dim_coords_and_dims=((time_coord, 0), )))
with self.assertRaises(TypeError):
with self.assertRaises((TypeError, ValueError)):
_io.concatenate(self.raw_cubes)

def test_fail_on_units_concatenate_with_overlap(self):
Expand Down