drop support for Python 3.6 and mark Python 3.9 as supported where not already

Author: gdementen

.github/workflows/python-package-conda.yml

@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         # os: ["ubuntu-latest", "macos-latest", "windows-latest"]
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9]
 
     defaults:
       run:

README.rst

@@ -73,7 +73,7 @@ Once you have satisfied the requirements detailed below, simply run::
 Required Dependencies
 ---------------------
 
-- Python 3.6 or 3.7
+- Python 3.7, 3.8 or 3.9
 - `numpy <http://www.numpy.org/>`__ (1.13 or later)
 - `pandas <http://pandas.pydata.org/>`__ (0.20 or later)
 

design.txt

@@ -279,7 +279,8 @@ G.clength.split[2, 5] == G.clength[2], G.clength[5]
 # minr_replica = [('benef_tot', [('men', 0.20), ('women', 0.57)])
 #                 ('prop_carr', [('men', 0.46), ('women', 0.65)])]
 
-# 3.6+ (nice but only string labels)
+# nice but only string labels
+
 # minr_replica = od(benef_tot=od(men=0.20, women=0.57),
 #                   prop_carr=od(men=0.46, women=0.65))
 

doc/source/changes/version_0_34.rst.inc

@@ -12,7 +12,7 @@ Syntax changes
 Backward incompatible changes
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-* other backward incompatible changes
+* dropped support for Python 3.6.
 
 
 New features

larray/core/array.py

@@ -30,7 +30,6 @@
 from collections.abc import Iterable, Sequence
 import builtins
 import os
-import sys
 import functools
 import warnings
 
@@ -2932,11 +2931,6 @@ def _prepare_aggregate(self, op, args, kwargs=None, commutative=False, stack_dep
                     assert isinstance(explicit_axis, AxisCollection)
                     args += tuple(explicit_axis)
             kwargs_items = kwargs.items()
-        if not commutative and len(kwargs_items) > 1:
-            # TODO: lift this restriction for python3.6+
-            raise ValueError(f"grouping aggregates on multiple axes at the same time using keyword arguments is not "
-                             f"supported for '{op.__name__}' (because it is not a commutative operation and keyword "
-                             f"arguments are *not* ordered in Python)")
 
         # Sort kwargs by axis name so that we have consistent results between runs because otherwise rounding errors
         # could lead to slightly different results even for commutative operations.
@@ -9312,7 +9306,7 @@ def eye(rows, columns=None, k=0, title=None, dtype=None, meta=None) -> Array:
 # stack(('M', a1), ('F', a2), axis='sex')
 # stack(a1, a2, axis='sex')
 
-# on Python 3.6, we could do something like (it would make from_lists obsolete for 1D arrays):
+# we could do something like (it would make from_lists obsolete for 1D arrays):
 # stack('sex', M=1, F=2)
 
 # which is almost equivalent to:
@@ -9520,10 +9514,8 @@ def stack(elements=None, axes=None, title=None, meta=None, dtype=None, res_axes=
           M  1.0  0.0
           F  1.0  0.0
 
-    Without passing an explicit order for labels (or an axis object like above), it should only be used on Python 3.6
-    or later because keyword arguments are NOT ordered on earlier Python versions.
+    Without passing an explicit order for labels (or an axis object like above)
 
-    >>> # use this only on Python 3.6 and later
     >>> stack(BE=arr1, FO=arr2, axes='nat')   # doctest: +SKIP
     sex\nat   BE   FO
           M  1.0  0.0
@@ -9583,17 +9575,9 @@ def stack(elements=None, axes=None, title=None, meta=None, dtype=None, res_axes=
         axes = AxisCollection(axes)
 
     if kwargs:
-        if not isinstance(axes, AxisCollection) and sys.version_info[:2] < (3, 6):
-            warnings.warn("keyword arguments ordering is not guaranteed for Python < 3.6 so it is not "
-                          "recommended to use them in stack() without providing labels order in the axes argument")
         elements = kwargs.items()
 
     if isinstance(elements, dict):
-        if not isinstance(axes, AxisCollection) and sys.version_info[:2] < (3, 7):
-            # stacklevel=3 because of deprecate_kwarg
-            warnings.warn("dict ordering is not guaranteed for Python < 3.7 so it is not recommended to use "
-                          "them in stack() without providing labels order in the axes argument", stacklevel=3)
-
         elements = elements.items()
 
     if isinstance(elements, Array):

larray/inout/excel.py

@@ -237,8 +237,7 @@ def __init__(self, fname, overwrite_file=False):
         super(PandasExcelHandler, self).__init__(fname, overwrite_file)
 
     def _open_for_read(self):
-        engine = 'openpyxl' if sys.version_info < (3, 7) else None
-        self.handle = pd.ExcelFile(self.fname, engine=engine)
+        self.handle = pd.ExcelFile(self.fname)
 
     def _open_for_write(self):
         _, ext = os.path.splitext(self.fname)

larray/tests/common.py

@@ -1,6 +1,5 @@
 import os
 import re
-import sys
 import inspect
 from contextlib import contextmanager
 
@@ -153,8 +152,6 @@ def meta():
 needs_xlsxwriter = pytest.mark.skipif(SKIP_EXCEL_TESTS or xlsxwriter is None,
                                       reason="xlsxwriter is required for this test")
 
-needs_python37 = pytest.mark.skipif(sys.version_info < (3, 7), reason="Python 3.7 is required for this test")
-
 
 @contextmanager
 def must_warn(warn_cls=None, msg=None, match=None, check_file=True, check_num=True):

larray/tests/test_array.py

@@ -11,8 +11,7 @@
 from larray.tests.common import meta
 from larray.tests.common import (inputpath, tmp_path,
                                  assert_array_equal, assert_array_nan_equal, assert_larray_equiv, assert_larray_equal,
-                                 needs_xlwings, needs_pytables, needs_xlsxwriter, needs_openpyxl, needs_python37,
-                                 must_warn)
+                                 needs_xlwings, needs_pytables, needs_xlsxwriter, needs_openpyxl, must_warn)
 from larray import (Array, LArray, Axis, AxisCollection, LGroup, IGroup, Metadata,
                     zeros, zeros_like, ndtest, empty, ones, eye, diag, stack, sequence,
                     union, clip, exp, where, X, mean, inf, nan, isnan, round,
@@ -5172,7 +5171,7 @@ def test_stack():
 
 
 def test_stack_kwargs_no_axis_labels():
-    # these tests rely on kwargs ordering, hence python 3.6
+    # these tests rely on kwargs ordering, hence python 3.6+
 
     # 1) using scalars
     # ----------------
@@ -5207,9 +5206,8 @@ def test_stack_kwargs_no_axis_labels():
     assert_array_equal(res, expected)
 
 
-@needs_python37
 def test_stack_dict_no_axis_labels():
-    # these tests rely on dict ordering, hence python 3.7
+    # these tests rely on dict ordering (hence require python 3.7+)
 
     # 1) dict of scalars
     # ------------------

make_release.py

@@ -37,16 +37,19 @@ def update_metapackage(local_repository, release_name, public_release=True, **ex
 
     # TODO: this should be echocall(redirect_stdout=False)
     print(f'Updating larrayenv metapackage to version {version}')
-    args = ['conda', 'metapackage', 'larrayenv', version, '--dependencies', f'larray =={version}',
-            f'larray-editor =={version}', f'larray_eurostat =={version}', "qtconsole", "matplotlib",
-            "pyqt", "qtpy", "pytables", "pydantic", "xlsxwriter", "xlrd", "xlwt", "openpyxl", "xlwings"]
-    # required for pydantic
-    if sys.version_info < (3, 7):
-        args += ["dataclasses"]
-    args += ['--user', 'larray-project', '--home', 'http://github.com/larray-project/larray',
-             '--license', 'GPL-3.0',
-             '--summary', "'Package installing larray and all sub-projects and optional dependencies'"]
-    check_call(args)
+    dependencies = [
+        f'larray =={version}', f'larray-editor =={version}', f'larray_eurostat =={version}', 
+        'qtconsole', 'matplotlib', 'pyqt', 'qtpy', 'pytables', 'pydantic',
+        'xlsxwriter', 'xlrd', 'xlwt', 'openpyxl', 'xlwings',
+    ]
+    check_call([
+        'conda', 'metapackage', 'larrayenv', version,
+        '--dependencies'] + dependencies + [
+        '--user', 'larray-project',
+        '--home', 'http://github.com/larray-project/larray',
+        '--license', 'GPL-3.0',
+        '--summary', "'Package installing larray and all sub-projects and optional dependencies'",
+    ])
 
 
 def merge_changelogs(build_dir, src_documentation, release_name, public_release, branch='master', **extra_kwargs):

setup.cfg

@@ -9,7 +9,7 @@ addopts = -v --doctest-modules
           --ignore=larray/core/npufuncs.py
           --ignore=larray/ipfp
           --ignore=larray/inout/xw_reporting.py
-          # doctest fails for Python 3.6 and numpy >= 1.17
+          # doctest is copied from numpy (and fails for some Python + numpy version combinations)
           --deselect larray/core/array.py::larray.core.array.Array.astype
           # doctest fails (because the plot method returns a matplotlib axis object,
           # which we do not mention in the doctest to make it nicer)