Skip to content

Commit 01e6073

Browse files
committed
Merge branch 'release/1.0.2'
2 parents a445e0d + f9e6321 commit 01e6073

File tree

11 files changed

+63
-47
lines changed

11 files changed

+63
-47
lines changed

.github/workflows/pythonapp.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,23 @@ jobs:
5656
- name: Test with pytest
5757
run: |
5858
python3 -m pytest --cov=kivy_garden.mapview --cov-report term --cov-branch tests/
59+
- name: Coveralls
60+
# use this custom action until Coveralls fixes uptream issues
61+
# https://github.com/coverallsapp/github-action/issues/30
62+
uses: AndreMiras/coveralls-python-action@develop
63+
with:
64+
parallel: true
65+
66+
coveralls_finish:
67+
needs: linux_test
68+
runs-on: ubuntu-latest
69+
steps:
70+
- name: Coveralls Finished
71+
# use this custom action until Coveralls fixes uptream issues
72+
# https://github.com/coverallsapp/github-action/issues/30
73+
uses: AndreMiras/coveralls-python-action@develop
74+
with:
75+
parallel-finished: true
5976

6077
windows_test:
6178
runs-on: windows-latest

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Change Log
22

3+
## [1.0.2]
4+
5+
- Fix `AttributeError` on `GeoJsonMapLayer.canvas_line`
6+
37
## [1.0.1]
48

59
- Migrate to kivy-garden/mapview

Dockerfile

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,36 @@
88
FROM ubuntu:18.04
99

1010
# configure locale
11-
RUN apt update -qq > /dev/null && apt install --yes --no-install-recommends \
12-
locales && \
13-
locale-gen en_US.UTF-8
11+
RUN apt -y update -qq > /dev/null && apt install --yes --no-install-recommends \
12+
locales \
13+
&& locale-gen en_US.UTF-8 \
14+
&& apt -y autoremove \
15+
&& apt -y clean \
16+
&& rm -rf /var/lib/apt/lists/*
1417
ENV LANG="en_US.UTF-8" \
1518
LANGUAGE="en_US.UTF-8" \
1619
LC_ALL="en_US.UTF-8"
1720

1821
# install system dependencies
19-
RUN apt update -qq > /dev/null && apt install --yes --no-install-recommends \
20-
python2.7-minimal libpython2.7-dev virtualenv make lsb-release pkg-config git build-essential \
21-
sudo libssl-dev tox
22-
23-
# install kivy system dependencies
24-
# https://kivy.org/docs/installation/installation-linux.html#dependencies-with-sdl2
25-
RUN apt install --yes --no-install-recommends \
26-
libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev
22+
RUN apt -y update -qq > /dev/null && apt install --yes --no-install-recommends \
23+
build-essential \
24+
git \
25+
lsb-release \
26+
libsdl2-dev \
27+
libsdl2-image-dev \
28+
libsdl2-mixer-dev \
29+
libsdl2-ttf-dev \
30+
libssl-dev \
31+
make \
32+
pkg-config \
33+
python3-pip \
34+
python3-setuptools \
35+
tox \
36+
virtualenv \
37+
&& python3 -m pip install --upgrade --no-cache setuptools \
38+
&& apt -y autoremove \
39+
&& apt -y clean \
40+
&& rm -rf /var/lib/apt/lists/*
2741

2842
WORKDIR /app
2943
COPY . /app

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
[![Github Build Status](https://github.com/kivy-garden/mapview/workflows/Garden%20flower/badge.svg)](https://github.com/kivy-garden/mapview/actions)
44
[![Build Status](https://travis-ci.com/kivy-garden/mapview.svg?branch=develop)](https://travis-ci.com/kivy-garden/mapview)
5+
[![Coverage Status](https://coveralls.io/repos/github/kivy-garden/mapview/badge.svg?branch=develop)](https://coveralls.io/github/kivy-garden/mapview?branch=develop)
56

67
Mapview is a Kivy widget for displaying interactive maps. It has been
78
designed with lot of inspirations of

kivy_garden/flower/__init__.py

Lines changed: 0 additions & 22 deletions
This file was deleted.

kivy_garden/flower/_version.py

Lines changed: 0 additions & 1 deletion
This file was deleted.

kivy_garden/flower/tests/test_import.py

Lines changed: 0 additions & 7 deletions
This file was deleted.

kivy_garden/mapview/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '1.0.1'
1+
__version__ = '1.0.2'

kivy_garden/mapview/geojson.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ def __init__(self, **kwargs):
198198
super(GeoJsonMapLayer, self).__init__(**kwargs)
199199
with self.canvas:
200200
self.canvas_polygon = Canvas()
201+
self.canvas_line = Canvas()
201202
with self.canvas_polygon.before:
202203
PushMatrix()
203204
self.g_matrix = MatrixInstruction()

setup.cfg

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
[flake8]
2+
max-line-length = 88
3+
extend-ignore =
4+
E122,
5+
E128,
6+
E203,
7+
E265,
8+
F401,
9+
E402,
10+
E501,
11+
W504
12+
13+
[coverage:run]
14+
relative_files = True

0 commit comments

Comments
 (0)