Skip to content

Commit d42808c

Browse files
authored
#205 Merge pull request from astropenguin/astropenguin/issue204
Drop support for Python 3.7
2 parents f1aeccb + b98fec6 commit d42808c

File tree

7 files changed

+453
-595
lines changed

7 files changed

+453
-595
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM python:3.11-slim
22

33
ENV PATH=$PATH:/root/.local/bin
44
ENV POETRY_VIRTUALENVS_CREATE=false
5-
ENV POETRY_VERSION=1.3.2
5+
ENV POETRY_VERSION=1.4.0
66

77
RUN apt-get update \
88
&& apt-get install -y curl git \

.devcontainer/devcontainer.json

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,26 @@
55
"dockerfile": "Dockerfile"
66
},
77
"postCreateCommand": "poetry install",
8-
"extensions": [
9-
"github.vscode-pull-request-github",
10-
"mhutchie.git-graph",
11-
"ms-python.python",
12-
"streetsidesoftware.code-spell-checker",
13-
"tamasfe.even-better-toml"
14-
],
15-
"settings": {
16-
"files.insertFinalNewline": true,
17-
"files.trimTrailingWhitespace": true,
18-
"python.formatting.provider": "black",
19-
"python.languageServer": "Pylance",
20-
"[python]": {
21-
"editor.formatOnSave": true,
22-
"editor.insertSpaces": true,
23-
"editor.tabSize": 4
8+
"customizations": {
9+
"vscode": {
10+
"extensions": [
11+
"github.vscode-pull-request-github",
12+
"mhutchie.git-graph",
13+
"ms-python.python",
14+
"streetsidesoftware.code-spell-checker",
15+
"tamasfe.even-better-toml"
16+
],
17+
"settings": {
18+
"files.insertFinalNewline": true,
19+
"files.trimTrailingWhitespace": true,
20+
"python.formatting.provider": "black",
21+
"python.languageServer": "Pylance",
22+
"[python]": {
23+
"editor.formatOnSave": true,
24+
"editor.insertSpaces": true,
25+
"editor.tabSize": 4
26+
}
27+
}
2428
}
2529
}
2630
}

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
python: ["3.7", "3.8", "3.9", "3.10", "3.11"]
20+
python: ["3.8", "3.9", "3.10", "3.11"]
2121
steps:
2222
- uses: actions/checkout@v2
2323
- uses: actions/setup-python@v2

poetry.lock

Lines changed: 416 additions & 556 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,22 @@ homepage = "https://github.com/astropenguin/xarray-dataclasses/"
1010
documentation = "https://astropenguin.github.io/xarray-dataclasses/"
1111

1212
[tool.poetry.dependencies]
13-
python = ">=3.7.1, <3.12"
14-
numpy = [
15-
{ version = ">=1.15, <1.22", python = ">=3.7.1, <3.8" },
16-
{ version = "^1.15", python = ">=3.8, <3.12" },
17-
]
18-
typing-extensions = ">=3.10, <5.0"
13+
python = ">=3.8, <3.12"
14+
numpy = "^1.22"
15+
typing-extensions = "^4.0"
1916
xarray = [
20-
{ version = ">=0.18, <0.21", python = ">=3.7.1, <3.8" },
21-
{ version = ">=0.18, <2023", python = ">=3.8, <3.12" },
17+
{ version = ">=2022.3, <2023.2", python = ">=3.8, <3.9" },
18+
{ version = "^2022.3", python = ">=3.9, <3.12" },
2219
]
2320

2421
[tool.poetry.group.dev.dependencies]
25-
black = "^22.8"
26-
ipython = [
27-
{ version = "^7.32", python = ">=3.7.1, <3.8" },
28-
{ version = "^8.4", python = ">=3.8, <3.12" },
29-
]
30-
myst-parser = "^0.18"
31-
pydata-sphinx-theme = "^0.9"
22+
black = "^23.1"
23+
ipython = "^8.11"
24+
myst-parser = "^1.0"
25+
pydata-sphinx-theme = "^0.13"
3226
pyright = "^1.1"
33-
pytest = "^7.1"
34-
sphinx = "^5.1"
27+
pytest = "^7.2"
28+
sphinx = "^6.1"
3529

3630
[tool.pyright]
3731
reportImportCycles = "warning"

xarray_dataclasses/dataarray.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
from functools import partial
77
from inspect import signature
88
from types import MethodType
9-
from typing import Any, Callable, Optional, Type, TypeVar, Union, overload
9+
from typing import Any, Callable, Optional, Protocol, Type, TypeVar, Union, overload
1010

1111

1212
# dependencies
1313
import numpy as np
1414
import xarray as xr
15-
from typing_extensions import ParamSpec, Protocol
15+
from typing_extensions import ParamSpec
1616

1717

1818
# submodules

xarray_dataclasses/dataset.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
from functools import partial
77
from inspect import signature
88
from types import MethodType
9-
from typing import Any, Callable, Dict, Optional, Type, TypeVar, overload
9+
from typing import Any, Callable, Dict, Optional, Protocol, Type, TypeVar, overload
1010

1111

1212
# dependencies
1313
import numpy as np
1414
import xarray as xr
15-
from typing_extensions import ParamSpec, Protocol
15+
from typing_extensions import ParamSpec
1616

1717

1818
# submodules

0 commit comments

Comments
 (0)