Skip to content

Commit

Permalink
Fix scripts requiring python3
Browse files Browse the repository at this point in the history
  • Loading branch information
owahltinez committed Apr 25, 2020
1 parent 6c89079 commit 60c42cc
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ FROM ubuntu:bionic

# Style dependencies
RUN apt-get update && apt-get install --no-install-recommends -y \
ca-certificates curl gnupg postgresql-client python fonts-hanazono \
fonts-noto-cjk fonts-noto-hinted fonts-noto-unhinted mapnik-utils \
nodejs npm ttf-unifont unzip && rm -rf /var/lib/apt/lists/*
ca-certificates curl gnupg postgresql-client python3 python3-distutils \
fonts-hanazono fonts-noto-cjk fonts-noto-hinted fonts-noto-unhinted \
mapnik-utils nodejs npm ttf-unifont unzip && rm -rf /var/lib/apt/lists/*

# Kosmtik with plugins, forcing prefix to /usr because bionic sets
# npm prefix to /usr/local, which breaks the install
Expand Down
4 changes: 2 additions & 2 deletions scripts/docker-startup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ EOF

kosmtik)
# Downloading needed shapefiles
python scripts/get-shapefiles.py -n
python3 scripts/get-shapefiles.py -n

# Creating default Kosmtik settings file
if [ ! -e ".kosmtik-config.yml" ]; then
cp /tmp/.kosmtik-config.yml .kosmtik-config.yml
cp /tmp/.kosmtik-config.yml .kosmtik-config.yml
fi
export KOSMTIK_CONFIGPATH=".kosmtik-config.yml"

Expand Down
2 changes: 1 addition & 1 deletion scripts/generate_road_colours.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def generate_colours(settings, section):
max_h = settings['hue'][1]

delta_h = (max_h - min_h) / colour_divisions

h = min_h
for name in road_classes:
hues[name] = h
Expand Down
2 changes: 1 addition & 1 deletion scripts/generate_shields.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3

# Generate highway shields as SVG files in symbols/shields.

Expand Down

0 comments on commit 60c42cc

Please sign in to comment.