Skip to content

Commit

Permalink
Merge branch 'master' into drop_python_2
Browse files Browse the repository at this point in the history
  • Loading branch information
rmarianski authored Dec 20, 2022
2 parents b93a910 + 4be0296 commit d9fb3ae
Show file tree
Hide file tree
Showing 6 changed files with 76 additions and 15 deletions.
57 changes: 57 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: CI

on:
push:
pull_request:

jobs:
tests:
name: Python ${{ matrix.python-version }}
runs-on: ubuntu-latest

strategy:
matrix:
python-version:
- '3.7'
- '3.8'
- '3.9'
- '3.10'

steps:
- uses: actions/checkout@v3

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: 'pip'
cache-dependency-path: 'setup.py'

- name: Install dependencies
run: |
pip install -U pip setuptools tox tox-py coverage
python setup.py install
- name: Run tox targets for ${{ matrix.python-version }}
run: |
tox --py current
coverage lcov
- name: Coveralls Parallel
uses: coverallsapp/[email protected]
with:
github-token: ${{ secrets.github_token }}
flag-name: run-${{ matrix.python-version }}
parallel: true
path-to-lcov: './coverage.lcov'

finish:
needs: tests
runs-on: ubuntu-latest
steps:
- name: Coveralls Finished
uses: coverallsapp/[email protected]
with:
github-token: ${{ secrets.github_token }}
parallel-finished: true
path-to-lcov: './coverage.lcov'
12 changes: 0 additions & 12 deletions .travis.yml

This file was deleted.

2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ Version 1.3.0
*In development*

* Drop Python 2 support
* Usage of `tox` for tests
* Add GitHub Actions

Version 1.2.1
-------------
Expand Down
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include README.md LICENSE CHANGELOG.md
include README.md LICENSE CHANGELOG.md mapbox_vector_tile/Mapbox/*.proto
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ def test_suite():
test_suite="setup.test_suite",
install_requires=[
"setuptools",
"protobuf",
"shapely",
"protobuf<4.20",
"shapely<2; python_version<'3.8'",
"shapely; python_version>='3.8'",
"future",
"pyclipper"
]
Expand Down
13 changes: 13 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[tox]
envlist = py37,py38,py39,py310

[tox:.package]
# Because of poetry
basepython = python3

[testenv]
deps =
pytest
pytest-cov
commands =
pytest --cov=mapbox_vector_tile

0 comments on commit d9fb3ae

Please sign in to comment.