From 57662966b8857331b55c6ceb8a950efa48aab51e Mon Sep 17 00:00:00 2001 From: travisgrigsby Date: Tue, 15 Mar 2022 12:03:52 -0700 Subject: [PATCH] use https url for git clone (#117) * use https url for git clone * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- batch-setup/make_meta_tiles.py | 2 +- batch-setup/make_rawr_tiles.py | 2 +- import/import_planet.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/batch-setup/make_meta_tiles.py b/batch-setup/make_meta_tiles.py index d6cad68..4cf6972 100644 --- a/batch-setup/make_meta_tiles.py +++ b/batch-setup/make_meta_tiles.py @@ -8,7 +8,6 @@ import time from collections import namedtuple from contextlib import contextmanager -from distutils.util import strtobool from multiprocessing import Pool from typing import Generator from typing import Iterator @@ -18,6 +17,7 @@ import yaml from batch import Buckets from batch import run_go +from distutils.util import strtobool from make_rawr_tiles import head_lines from make_rawr_tiles import wait_for_jobs_to_finish from make_rawr_tiles import wc_line diff --git a/batch-setup/make_rawr_tiles.py b/batch-setup/make_rawr_tiles.py index 8d70da5..f7352c9 100644 --- a/batch-setup/make_rawr_tiles.py +++ b/batch-setup/make_rawr_tiles.py @@ -4,10 +4,10 @@ import tempfile from collections import namedtuple from contextlib import contextmanager -from distutils.util import strtobool import boto3 import yaml +from distutils.util import strtobool from ModestMaps.Core import Coordinate from tilequeue.command import make_config_from_argparse from tilequeue.command import tilequeue_batch_enqueue diff --git a/import/import_planet.sh b/import/import_planet.sh index 2ab6dc7..4805339 100644 --- a/import/import_planet.sh +++ b/import/import_planet.sh @@ -73,7 +73,7 @@ sudo DEBIAN_FRONTEND=noninteractive apt install -y -q make g++ git awscli build- # make osm2pgsql from source if [[ ! -f "${OSM2PGSQL}" ]]; then - git clone git://github.com/openstreetmap/osm2pgsql.git + git clone https://github.com/openstreetmap/osm2pgsql.git cd osm2pgsql git checkout tags/1.5.1 sudo DEBIAN_FRONTEND=noninteractive sudo apt install -y -q make cmake g++ libboost-dev libboost-system-dev \