From 10d266c8bb859b4ca60a734f4ce01265a39cc18b Mon Sep 17 00:00:00 2001 From: ingalls Date: Wed, 6 Sep 2023 14:00:33 +0100 Subject: [PATCH 1/5] Update Core Deps --- Dockerfile | 2 +- openaddr/cache.py | 1 - openaddr/tests/__init__.py | 2 +- openaddr/tests/cache.py | 2 +- openaddr/tests/slippymap.py | 2 +- openaddr/tests/util.py | 2 +- setup.py | 15 +++++---------- 7 files changed, 10 insertions(+), 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5a67f128..1fae138e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM osgeo/gdal:alpine-normal-3.6.1 +FROM osgeo/gdal:alpine-normal-3.7.2 RUN apk add nodejs yarn git python3 python3-dev py3-pip \ make bash sqlite-dev zlib-dev geos geos-dev \ diff --git a/openaddr/cache.py b/openaddr/cache.py index 906bfabc..aac53f22 100644 --- a/openaddr/cache.py +++ b/openaddr/cache.py @@ -8,7 +8,6 @@ import shutil import re import csv -import simplejson as json from os import mkdir from hashlib import md5 diff --git a/openaddr/tests/__init__.py b/openaddr/tests/__init__.py index b89fa43f..226d9ff2 100644 --- a/openaddr/tests/__init__.py +++ b/openaddr/tests/__init__.py @@ -44,7 +44,7 @@ from requests import get from httmock import response, HTTMock -import mock +import unittest.mock from .. import cache, conform, process_one from ..cache import CacheResult diff --git a/openaddr/tests/cache.py b/openaddr/tests/cache.py index 8f9ebf51..93e6eaa7 100644 --- a/openaddr/tests/cache.py +++ b/openaddr/tests/cache.py @@ -7,7 +7,7 @@ import shutil import mimetypes -from mock import patch +from unittest.mock import patch from esridump.errors import EsriDownloadError import unittest import httmock diff --git a/openaddr/tests/slippymap.py b/openaddr/tests/slippymap.py index bb561163..d17f54f3 100644 --- a/openaddr/tests/slippymap.py +++ b/openaddr/tests/slippymap.py @@ -3,7 +3,7 @@ import os import unittest import tempfile -import mock +import unittest.mock from os.path import join, dirname from zipfile import ZipFile diff --git a/openaddr/tests/util.py b/openaddr/tests/util.py index 5de244b2..254ed56d 100644 --- a/openaddr/tests/util.py +++ b/openaddr/tests/util.py @@ -10,7 +10,7 @@ from mimetypes import guess_type from urllib.parse import urlparse, parse_qs from httmock import HTTMock, response -from mock import Mock, patch +from unittest.mock import Mock, patch from .. import util, __version__ diff --git a/setup.py b/setup.py index 7e4dd0f1..c55488e7 100644 --- a/setup.py +++ b/setup.py @@ -36,29 +36,24 @@ install_requires = [ 'dateutils == 0.6.12', 'ijson == 2.4', - 'simplejson == 3.18.0', - - # http://www.voidspace.org.uk/python/mock/ - 'mock == 3.0.5', - # https://github.com/uri-templates/uritemplate-py/ 'uritemplate == 4.1.1', # http://docs.python-requests.org/en/master/ - 'requests == 2.28.1', + 'requests == 2.31.0', # https://github.com/patrys/httmock 'httmock == 1.4.0', # https://github.com/openaddresses/pyesridump - 'esridump == 1.11.0', + 'esridump == 1.13.0', # Used in openaddr.parcels - 'Shapely == 2.0.0', + 'Shapely == 2.0.1', # https://github.com/tilezen/mapbox-vector-tile 'mapbox-vector-tile @ git+https://github.com/tilezen/mapbox-vector-tile.git@5249a23da696515f118564dbcc83b39216792454#egg=mapbox-vector-tile', - 'future==0.18.2', - 'protobuf==4.21', + 'future==0.18.3', + 'protobuf==4.24', ] ) From f8c199c4cb0582a9e92bcfbe75f05fe913e82835 Mon Sep 17 00:00:00 2001 From: ingalls Date: Wed, 6 Sep 2023 14:06:44 +0100 Subject: [PATCH 2/5] MVT Changes have merged --- openaddr/preview.py | 5 +++-- setup.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/openaddr/preview.py b/openaddr/preview.py index d336deb5..811db3bc 100644 --- a/openaddr/preview.py +++ b/openaddr/preview.py @@ -189,6 +189,9 @@ def projected_geom(geometry, mx, bx, my, by): for (row, col) in row_cols: url = uritemplate.expand(TILE_URL, dict(z=zoom, x=col, y=row, access_token=mapbox_key)) + + _L.debug('Getting tile {}'.format(url)) + got = requests.get(url) tile = mapbox_vector_tile.decode(got.content) bounds = tile_bounds(row, col, zoom) @@ -213,8 +216,6 @@ def projected_geom(geometry, mx, bx, my, by): if feature['properties'].get('class') in ('motorway', 'motorway_link', 'trunk', 'primary', 'secondary', 'tertiary', 'link', 'street', 'street_limited', 'pedestrian', 'construction', 'track', 'service', 'major_rail', 'minor_rail'): roads_geoms.append(projected_geom(feature['geometry'], *road_xform)) - _L.debug('Getting tile {}'.format(url)) - return landuse_geoms, water_geoms, roads_geoms def get_projection(): diff --git a/setup.py b/setup.py index c55488e7..fc25841a 100644 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ 'Shapely == 2.0.1', # https://github.com/tilezen/mapbox-vector-tile - 'mapbox-vector-tile @ git+https://github.com/tilezen/mapbox-vector-tile.git@5249a23da696515f118564dbcc83b39216792454#egg=mapbox-vector-tile', + 'mapbox-vector-tile == 2.0.1', 'future==0.18.3', 'protobuf==4.24', ] From 87dc93bd0a497c95cf3faf9943cac5e64d2f3a9d Mon Sep 17 00:00:00 2001 From: ingalls Date: Wed, 6 Sep 2023 14:09:29 +0100 Subject: [PATCH 3/5] Prefix with GH Package Registery --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1fae138e..3d9d17f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM osgeo/gdal:alpine-normal-3.7.2 +FROM ghcr.io/osgeo/gdal:alpine-small-3.7.2 RUN apk add nodejs yarn git python3 python3-dev py3-pip \ make bash sqlite-dev zlib-dev geos geos-dev \ From 247eda99741cfdde723129c642ffe58e26627ed2 Mon Sep 17 00:00:00 2001 From: ingalls Date: Wed, 6 Sep 2023 14:40:11 +0100 Subject: [PATCH 4/5] Get GDAL Package --- Dockerfile | 2 +- setup.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3d9d17f2..272bae85 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/osgeo/gdal:alpine-small-3.7.2 +FROM ghcr.io/osgeo/gdal:alpine-normal-3.7.1 RUN apk add nodejs yarn git python3 python3-dev py3-pip \ make bash sqlite-dev zlib-dev geos geos-dev \ diff --git a/setup.py b/setup.py index fc25841a..cb73bc46 100644 --- a/setup.py +++ b/setup.py @@ -34,6 +34,8 @@ }, test_suite = 'openaddr.tests', install_requires = [ + 'gdal == 3.7.1', + 'dateutils == 0.6.12', 'ijson == 2.4', # https://github.com/uri-templates/uritemplate-py/ From b484b7d93f959224a08ef6f34897007ec5eb9a99 Mon Sep 17 00:00:00 2001 From: ingalls Date: Wed, 6 Sep 2023 16:46:14 +0100 Subject: [PATCH 5/5] Switch Import Style --- openaddr/tests/__init__.py | 2 +- openaddr/tests/slippymap.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openaddr/tests/__init__.py b/openaddr/tests/__init__.py index 226d9ff2..3bc9da6c 100644 --- a/openaddr/tests/__init__.py +++ b/openaddr/tests/__init__.py @@ -44,7 +44,7 @@ from requests import get from httmock import response, HTTMock -import unittest.mock +from unittest import mock from .. import cache, conform, process_one from ..cache import CacheResult diff --git a/openaddr/tests/slippymap.py b/openaddr/tests/slippymap.py index d17f54f3..cab9b881 100644 --- a/openaddr/tests/slippymap.py +++ b/openaddr/tests/slippymap.py @@ -3,7 +3,7 @@ import os import unittest import tempfile -import unittest.mock +from unittest import mock from os.path import join, dirname from zipfile import ZipFile