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.

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

Working Ubuntu-22.04 Docker build. #1283

Merged
merged 2 commits into from Aug 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 4 additions & 5 deletions docker/Dockerfile
Expand Up @@ -4,20 +4,19 @@
## Copyright (c) 2015-2020 ODC Contributors
## SPDX-License-Identifier: Apache-2.0
##
FROM osgeo/gdal:ubuntu-small-3.4.1
ARG V_PG=12
ARG V_PGIS=12-postgis-3
FROM osgeo/gdal:ubuntu-small-latest
ARG V_PG=14
ARG V_PGIS=14-postgis-3

# Update and install Ubuntu packages

USER root
RUN apt-get update -y \
&& DEBIAN_FRONTEND=noninteractive apt-get upgrade -y \
&& DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y \
&& echo Doing postgresql-${PGIS} \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-change-held-packages --fix-missing --no-install-recommends \
libpq-dev libudunits2-dev \
git \
libpq-dev libudunits2-dev libproj-dev \
python3-dev python3-distutils python3-pip \
build-essential \
postgresql \
Expand Down
9 changes: 5 additions & 4 deletions docker/constraints.in
Expand Up @@ -38,14 +38,15 @@ toolz
# FOR INVESTIGATION: xarray 2022.6.0 breaks virtual products tests.
xarray>=0.18,!=2022.6.0

# pytest
pytest==6.1.2
pytest-cov==2.10.1
# Previous pins were to very old versions
# pytest Py3.10 requires >6.2.5
pytest>=6.2.5
pytest-cov>=3.0.0
hypothesis>=6
pytest-httpserver
pytest-timeout

# every new version finds new errors, so we pin it
# every new version finds new errors, so we pin it (so old though!)
pylint==2.4.4
pycodestyle==2.5.0

Expand Down
32 changes: 11 additions & 21 deletions docker/constraints.txt
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with python 3.8
# This file is autogenerated by pip-compile with python 3.10
# To update, run:
#
# pip-compile --strip-extras constraints.in
Expand Down Expand Up @@ -133,12 +133,7 @@ idna==3.3
imagesize==1.4.1
# via sphinx
importlib-metadata==4.12.0
# via
# keyring
# sphinx
# twine
importlib-resources==5.9.0
# via jsonschema
# via twine
iniconfig==1.1.1
# via pytest
isodate==0.6.1
Expand Down Expand Up @@ -229,9 +224,7 @@ pillow==9.2.0
# via matplotlib
pkginfo==1.8.3
# via twine
pkgutil-resolve-name==1.3.10
# via jsonschema
pluggy==0.13.1
pluggy==1.0.0
# via pytest
psutil==5.9.1
# via distributed
Expand Down Expand Up @@ -264,12 +257,12 @@ pyproj==3.2.1
# owslib
pyrsistent==0.18.1
# via jsonschema
pytest==6.1.2
pytest==7.1.2
# via
# -r constraints.in
# pytest-cov
# pytest-timeout
pytest-cov==2.10.1
pytest-cov==3.0.0
# via -r constraints.in
pytest-httpserver==1.0.5
# via -r constraints.in
Expand Down Expand Up @@ -381,11 +374,12 @@ sqlalchemy==1.4.40
tblib==1.7.0
# via distributed
toml==0.10.2
# via -r constraints.in
tomli==2.0.1
# via
# -r constraints.in
# coverage
# pytest
tomli==2.0.1
# via setuptools-scm
# setuptools-scm
toolz==0.12.0
# via
# -r constraints.in
Expand All @@ -397,9 +391,7 @@ tornado==6.1
twine==4.0.1
# via -r constraints.in
typing-extensions==4.3.0
# via
# rich
# setuptools-scm
# via setuptools-scm
urllib3==1.26.11
# via
# botocore
Expand Down Expand Up @@ -428,9 +420,7 @@ xmltodict==0.13.0
zict==2.2.0
# via distributed
zipp==3.8.1
# via
# importlib-metadata
# importlib-resources
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# setuptools
1 change: 1 addition & 0 deletions docs/about/whats_new.rst
Expand Up @@ -8,6 +8,7 @@ What's New
v1.8.next
=========

- Migrate main test docker build to Ubuntu 22.04 and Python 3.10. (:pull:`1283`)
- Dynamically create tables to serve as spatial indexes in postgis driver. (:pull:`1312`)
- EO3 data fixtures and tests. Fix SQLAlchemy bugs in postgis driver. (:pull:`1309`)
- Dependency updates. (:pull:`1308`, :pull:`1313`)
Expand Down