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

Update to python 3.10 #247

Merged
merged 3 commits into from
Sep 24, 2024
Merged

Update to python 3.10 #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60cb346
upgrade to python 3.10
corviday Sep 19, 2024
d55393c
cleanup
corviday Sep 24, 2024
91f0791
skip prompt
corviday Sep 24, 2024
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 .github/workflows/pypi-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: '3.8'
python-version: '3.10'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/python-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ jobs:
test:

runs-on: ubuntu-22.04
container: pcic/geospatial-python:3.3.0
container: pcic/geospatial-python:3.4.0

steps:
- uses: actions/checkout@v2
- name: Install system dependencies
run: |
apk upgrade
apk add libxml2-dev libxslt-dev libffi-dev
apt-get update
apt-get install -yq libxml2-dev libxslt-dev libffi-dev wget

- name: Install poetry
run: |
Expand Down
4 changes: 2 additions & 2 deletions ce/api/geo.py
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's great to see this included!

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import logging
import sys
from collections import OrderedDict
from collections import OrderedDict, deque
from threading import RLock
from contextlib import ContextDecorator, contextmanager
import shutil
Expand All @@ -16,7 +16,7 @@

# From http://stackoverflow.com/a/30316760/597593
from numbers import Number
from collections import Set, Mapping, deque
from collections.abc import Set, Mapping

from tempfile import NamedTemporaryFile

Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM pcic/geospatial-python:3.3.0
FROM pcic/geospatial-python:3.4.0

RUN mkdir /app
ADD poetry.lock /app
ADD pyproject.toml /app
WORKDIR /app

RUN apk add libffi-dev
RUN apt-get install libffi-dev
RUN wget -O - https://install.python-poetry.org | python3 -
ENV PATH=/root/.local/bin:$PATH
RUN poetry install --with=dev
Expand Down
10 changes: 7 additions & 3 deletions docker/Dockerfile.prod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
# Image with gdal 3.3.0
FROM pcic/geospatial-python:3.3.0
FROM pcic/geospatial-python:3.4.0

RUN apk add postgresql-dev libxml2-dev libxslt-dev geos-dev
RUN apt-get update && \
apt-get install -yq libpq-dev \
libxml2-dev \
libgeos-dev \
libffi-dev \
wget

ADD . /app
WORKDIR /app

RUN apk add libffi-dev
RUN wget -O - https://install.python-poetry.org | python3 -
ENV PATH=/root/.local/bin:$PATH
RUN poetry install
Expand Down
Loading