Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Upgrade dependencies
  • Loading branch information
chaitan94 committed Jan 8, 2020
1 parent d51e21c commit b3d3b90
Show file tree
Hide file tree
Showing 5 changed files with 383 additions and 483 deletions.
61 changes: 30 additions & 31 deletions .github/workflows/tests.yml
Expand Up @@ -3,49 +3,48 @@ name: Tests
on:
push:
branches:
- master
- master
pull_request:
branches:
- master
- master

jobs:
container-job:
runs-on: ubuntu-latest

container:
image: python
image: python

services:
mobilitydb:
image: codewit/mobilitydb
ports:
- 5432:5432
- 5432:5432

steps:
- uses: actions/checkout@v1

- name: Set up Python 3.8
uses: actions/setup-python@v1
with:
python-version: 3.8

- name: Setup Poetry (preview version)
uses: dschep/install-poetry-action@v1.2
with:
preview: true

- name: Setup dependencies
run: |
apt-get -qq update
apt-get -yqq install libgeos-dev libproj-dev proj-data proj-bin libgdal-dev
poetry install
poetry run pip install cython
poetry run pip install git+https://github.com/SciTools/cartopy.git --no-binary cartopy
poetry run pip install movingpandas
poetry run pip install rasterio --upgrade
- name: Test with pytest
run: poetry run pytest
env:
MOBILITYDB_HOST: mobilitydb
MOBILITYDB_PORT: ${{ job.services.mobilitydb.ports[5432] }}
- uses: actions/checkout@v1

- name: Set up Python 3.8
uses: actions/setup-python@v1
with:
python-version: 3.8

- name: Setup Poetry (preview version)
uses: dschep/install-poetry-action@v1.2
with:
preview: true

- name: Setup dependencies
run: |
apt-get -qq update
apt-get -yqq install libgeos-dev libproj-dev proj-data proj-bin libgdal-dev
poetry install
poetry run pip install cython
poetry run pip install git+https://github.com/SciTools/cartopy.git --no-binary cartopy
poetry run pip install movingpandas
- name: Test with pytest
run: poetry run pytest
env:
MOBILITYDB_HOST: mobilitydb
MOBILITYDB_PORT: ${{ job.services.mobilitydb.ports[5432] }}
5 changes: 1 addition & 4 deletions README.rst
Expand Up @@ -98,11 +98,8 @@ movingpandas is an optional dependency - but to run tests you would need it. So
pip install cython
pip install git+https://github.com/SciTools/cartopy.git --no-binary cartopy
pip install movingpandas
pip install rasterio --upgrade
# This is because of movingpandas depencenies rasterio, cython and cartopy:
# (1) rasterio, cython result in unresolved dependencies
# (2) cartopy is not PEP 518 compliant
# This is because of movingpandas dependency cartopy not being PEP 518 compliant
# Refer: https://github.com/SciTools/cartopy/issues/1112
Now, you can actually run the tests using:
Expand Down
5 changes: 1 addition & 4 deletions docs/quickstart.rst
Expand Up @@ -264,11 +264,8 @@ For this the optional dependency "movingpandas" needs to be installed.
pip install cython
pip install git+https://github.com/SciTools/cartopy.git --no-binary cartopy
pip install movingpandas
pip install rasterio --upgrade
# This is because of movingpandas depencenies rasterio, cython and cartopy:
# (1) rasterio, cython result in unresolved dependencies
# (2) cartopy is not PEP 518 compliant
# This is because of movingpandas dependency cartopy not being PEP 518 compliant
# Refer: https://github.com/SciTools/cartopy/issues/1112
Expand Down

0 comments on commit b3d3b90

Please sign in to comment.