Skip to content

Commit 92bff67

Browse files
Merge pull request #38 from spectriclabs/python3.10
Upgrade to Python 3.10
2 parents 20a9dd5 + fd96f87 commit 92bff67

File tree

4 files changed

+17
-13
lines changed

4 files changed

+17
-13
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
packages: write
1717

1818
steps:
19-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v3
2020
- uses: docker/login-action@v2
2121
with:
2222
registry: ${{ env.REGISTRY }}

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ jobs:
1414
runs-on: ${{ matrix.os }}
1515
strategy:
1616
matrix:
17-
python-version: ['3.9']
17+
python-version: ['3.10']
1818
os: [ubuntu-latest]
1919

2020
steps:
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v3
2222
- name: Set up Python ${{ matrix.python-version }}
23-
uses: actions/setup-python@v3
23+
uses: actions/setup-python@v4
2424
with:
2525
python-version: ${{ matrix.python-version }}
2626
architecture: x64
@@ -43,7 +43,7 @@ jobs:
4343
- name: Create timestamp env
4444
run: echo "timestamp=$(date --utc +%Y%m%d%H%M%S)" >> $GITHUB_ENV
4545
shell: bash
46-
- uses: actions/checkout@v2
46+
- uses: actions/checkout@v3
4747
- uses: docker/login-action@v2
4848
with:
4949
registry: ${{ env.REGISTRY }}

Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
FROM python:3.9 AS builder
1+
FROM python:3.10 AS builder
2+
3+
ENV PIP_ROOT_USER_ACTION=ignore
24

35
RUN mkdir -p /build
46
RUN pip install --upgrade pip && \
@@ -9,9 +11,11 @@ COPY elastic_datashader /build/elastic_datashader
911
WORKDIR /build/elastic_datashader
1012
RUN poetry build
1113

12-
FROM python:3.9 AS deployment
14+
FROM python:3.10 AS deployment
1315
LABEL maintainer="foss@spectric.com"
1416

17+
ENV PIP_ROOT_USER_ACTION=ignore
18+
1519
COPY --from=builder /build/dist/*.whl /opt/elastic_datashader/
1620
RUN mkdir -p /opt/elastic_datashader/tms-cache && \
1721
pip install --upgrade pip && \

pyproject.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ classifiers = [
2020
elastic_datashader = "elastic_datashader.cli:main"
2121

2222
[tool.poetry.dependencies]
23-
python = ">=3.8,<4"
23+
python = ">=3.10,<4"
2424
elasticsearch = "7.17.4"
2525
elasticsearch-dsl = "7.4.0"
2626
datashader = "0.14.2"
@@ -33,12 +33,12 @@ pynumeral = "*"
3333
arrow = "*"
3434
python-datemath = "*"
3535
numba = "*"
36-
numpy = ">=1.19,<=1.21"
36+
numpy = "^1.23"
3737
PyYAML = "*"
3838
humanize = "*"
3939
uvicorn = {extras = ["standard"], version = "^0.18.2", optional = true}
40-
fastapi = "^0.73.0"
41-
georgio = "2022.225.1340"
40+
fastapi = "^0.86"
41+
georgio = "2022.313.1239"
4242

4343
[tool.poetry.dev-dependencies]
4444
pytest = "*"
@@ -64,13 +64,13 @@ line-length = 150
6464
[tool.tox]
6565
legacy_tox_ini = """
6666
[tox]
67-
envlist = py39
67+
envlist = py310
6868
isolated_build = true
6969
recreate = true
7070
7171
[gh-actions]
7272
python =
73-
3.9: py39
73+
3.10: py310
7474
7575
[testenv]
7676
setenv =

0 commit comments

Comments
 (0)