Skip to content

Commit

Permalink
Merge branch 'release/1.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
AndreMiras committed Apr 19, 2020
2 parents a445e0d + f9e6321 commit 01e6073
Show file tree
Hide file tree
Showing 11 changed files with 63 additions and 47 deletions.
17 changes: 17 additions & 0 deletions .github/workflows/pythonapp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,23 @@ jobs:
- name: Test with pytest
run: |
python3 -m pytest --cov=kivy_garden.mapview --cov-report term --cov-branch tests/
- name: Coveralls
# use this custom action until Coveralls fixes uptream issues
# https://github.com/coverallsapp/github-action/issues/30
uses: AndreMiras/coveralls-python-action@develop
with:
parallel: true

coveralls_finish:
needs: linux_test
runs-on: ubuntu-latest
steps:
- name: Coveralls Finished
# use this custom action until Coveralls fixes uptream issues
# https://github.com/coverallsapp/github-action/issues/30
uses: AndreMiras/coveralls-python-action@develop
with:
parallel-finished: true

windows_test:
runs-on: windows-latest
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change Log

## [1.0.2]

- Fix `AttributeError` on `GeoJsonMapLayer.canvas_line`

## [1.0.1]

- Migrate to kivy-garden/mapview
Expand Down
36 changes: 25 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,36 @@
FROM ubuntu:18.04

# configure locale
RUN apt update -qq > /dev/null && apt install --yes --no-install-recommends \
locales && \
locale-gen en_US.UTF-8
RUN apt -y update -qq > /dev/null && apt install --yes --no-install-recommends \
locales \
&& locale-gen en_US.UTF-8 \
&& apt -y autoremove \
&& apt -y clean \
&& rm -rf /var/lib/apt/lists/*
ENV LANG="en_US.UTF-8" \
LANGUAGE="en_US.UTF-8" \
LC_ALL="en_US.UTF-8"

# install system dependencies
RUN apt update -qq > /dev/null && apt install --yes --no-install-recommends \
python2.7-minimal libpython2.7-dev virtualenv make lsb-release pkg-config git build-essential \
sudo libssl-dev tox

# install kivy system dependencies
# https://kivy.org/docs/installation/installation-linux.html#dependencies-with-sdl2
RUN apt install --yes --no-install-recommends \
libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev
RUN apt -y update -qq > /dev/null && apt install --yes --no-install-recommends \
build-essential \
git \
lsb-release \
libsdl2-dev \
libsdl2-image-dev \
libsdl2-mixer-dev \
libsdl2-ttf-dev \
libssl-dev \
make \
pkg-config \
python3-pip \
python3-setuptools \
tox \
virtualenv \
&& python3 -m pip install --upgrade --no-cache setuptools \
&& apt -y autoremove \
&& apt -y clean \
&& rm -rf /var/lib/apt/lists/*

WORKDIR /app
COPY . /app
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

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

Mapview is a Kivy widget for displaying interactive maps. It has been
designed with lot of inspirations of
Expand Down
22 changes: 0 additions & 22 deletions kivy_garden/flower/__init__.py

This file was deleted.

1 change: 0 additions & 1 deletion kivy_garden/flower/_version.py

This file was deleted.

7 changes: 0 additions & 7 deletions kivy_garden/flower/tests/test_import.py

This file was deleted.

2 changes: 1 addition & 1 deletion kivy_garden/mapview/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '1.0.1'
__version__ = '1.0.2'
1 change: 1 addition & 0 deletions kivy_garden/mapview/geojson.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ def __init__(self, **kwargs):
super(GeoJsonMapLayer, self).__init__(**kwargs)
with self.canvas:
self.canvas_polygon = Canvas()
self.canvas_line = Canvas()
with self.canvas_polygon.before:
PushMatrix()
self.g_matrix = MatrixInstruction()
Expand Down
14 changes: 14 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[flake8]
max-line-length = 88
extend-ignore =
E122,
E128,
E203,
E265,
F401,
E402,
E501,
W504

[coverage:run]
relative_files = True
5 changes: 0 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,3 @@ commands =
[testenv:pep8]
deps = flake8
commands = flake8 kivy_garden/ examples/

[flake8]
ignore =
E122, E128, E265, E402, E501,
F401, W504

0 comments on commit 01e6073

Please sign in to comment.