Skip to content

Commit 486b7c5

Browse files
Drop python 3.8, test python 3.11 (#209)
* Drop py38 * bump to py 3.11 * more bump * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * revert bump for xarray tests --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent 528a645 commit 486b7c5

File tree

8 files changed

+16
-17
lines changed

8 files changed

+16
-17
lines changed

.github/workflows/ci-additional.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141

4242
env:
4343
CONDA_ENV_FILE: ci/environment.yml
44-
PYTHON_VERSION: "3.10"
44+
PYTHON_VERSION: "3.11"
4545

4646
steps:
4747
- uses: actions/checkout@v4
@@ -92,7 +92,7 @@ jobs:
9292
shell: bash -l {0}
9393
env:
9494
CONDA_ENV_FILE: ci/environment.yml
95-
PYTHON_VERSION: "3.10"
95+
PYTHON_VERSION: "3.11"
9696

9797
steps:
9898
- uses: actions/checkout@v4

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
fail-fast: false
2626
matrix:
2727
os: ["ubuntu-latest", "windows-latest"]
28-
python-version: ["3.8", "3.10"]
28+
python-version: ["3.9", "3.11"]
2929
steps:
3030
- uses: actions/checkout@v4
3131
with:

.github/workflows/testpypi-release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- uses: actions/setup-python@v4
2525
name: Install Python
2626
with:
27-
python-version: "3.10"
27+
python-version: "3.11"
2828

2929
- name: Install dependencies
3030
run: |
@@ -65,7 +65,7 @@ jobs:
6565
- uses: actions/setup-python@v4
6666
name: Install Python
6767
with:
68-
python-version: "3.10"
68+
python-version: "3.11"
6969
- uses: actions/download-artifact@v3
7070
with:
7171
name: releases

.github/workflows/upstream-dev-ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
strategy:
2727
fail-fast: false
2828
matrix:
29-
python-version: ["3.10"]
29+
python-version: ["3.11"]
3030
steps:
3131
- uses: actions/checkout@v4
3232
with:

flox/core.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,14 @@
77
import sys
88
import warnings
99
from collections import namedtuple
10+
from collections.abc import Mapping, Sequence
1011
from functools import partial, reduce
1112
from numbers import Integral
1213
from typing import (
1314
TYPE_CHECKING,
1415
Any,
1516
Callable,
16-
Dict,
1717
Literal,
18-
Mapping,
19-
Sequence,
2018
Union,
2119
overload,
2220
)
@@ -74,8 +72,8 @@
7472
T_IsBins = Union[bool | Sequence[bool]]
7573

7674

77-
IntermediateDict = Dict[Union[str, Callable], Any]
78-
FinalResultsDict = Dict[str, Union["DaskArray", np.ndarray]]
75+
IntermediateDict = dict[Union[str, Callable], Any]
76+
FinalResultsDict = dict[str, Union["DaskArray", np.ndarray]]
7977
FactorProps = namedtuple("FactorProps", "offset_group nan_sentinel nanmask")
8078

8179
# This dummy axis is inserted using np.expand_dims

flox/xarray.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from __future__ import annotations
22

3-
from typing import TYPE_CHECKING, Any, Hashable, Iterable, Sequence, Union
3+
from collections.abc import Hashable, Iterable, Sequence
4+
from typing import TYPE_CHECKING, Any, Union
45

56
import numpy as np
67
import pandas as pd

flox/xrutils.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
# defined in xarray
33

44
import datetime
5-
from typing import Any, Iterable
5+
from collections.abc import Iterable
6+
from typing import Any
67

78
import numpy as np
89
import pandas as pd

pyproject.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@ name = "flox"
33
description = "GroupBy operations for dask.array"
44
license = {file = "LICENSE"}
55
readme = "README.md"
6-
requires-python = ">=3.8"
6+
requires-python = ">=3.9"
77
keywords = ["xarray", "dask", "groupby"]
88
classifiers = [
99
"Development Status :: 4 - Beta",
1010
"License :: OSI Approved :: Apache Software License",
1111
"Natural Language :: English",
1212
"Operating System :: OS Independent",
1313
"Programming Language :: Python",
14-
"Programming Language :: Python :: 3.8",
1514
"Programming Language :: Python :: 3.9",
1615
"Programming Language :: Python :: 3.10",
1716
"Programming Language :: Python :: 3.11",
@@ -60,10 +59,10 @@ write_to_template= '__version__ = "{version}"'
6059

6160
[tool.black]
6261
line-length = 100
63-
target-version = ["py38"]
62+
target-version = ["py39"]
6463

6564
[tool.ruff]
66-
target-version = "py38"
65+
target-version = "py39"
6766
builtins = ["ellipsis"]
6867
exclude = [
6968
".eggs",

0 commit comments

Comments
 (0)