Skip to content

Commit

Permalink
Merge 5b55eb8 into a79ba5e
Browse files Browse the repository at this point in the history
  • Loading branch information
sebhahn committed Mar 18, 2021
2 parents a79ba5e + 5b55eb8 commit c9a1bd7
Show file tree
Hide file tree
Showing 530 changed files with 570 additions and 541 deletions.
5 changes: 5 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ branch = True
source = pytileproj
# omit = bad_file.py

[paths]
source =
src/
*/site-packages/

[report]
# Regexes for lines to exclude from consideration
exclude_lines =
Expand Down
70 changes: 70 additions & 0 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
name: ubuntu

on:
push:
pull_request:
schedule:
- cron: '0 0 * * *' # daily

jobs:
build:
name: Build py${{ matrix.python-version }} @ ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: ['3.6']
os: ["ubuntu-latest"]

steps:
- uses: actions/checkout@v2
- uses: conda-incubator/setup-miniconda@v2.0.1
with:
miniconda-version: "latest"
auto-update-conda: true
python-version: ${{ matrix.python-version }}
environment-file: environment.yml
activate-environment: pytileproj_env
auto-activate-base: false
- name: Print environment infos
shell: bash -l {0}
run: |
conda info -a
conda list
pip list
which pip
which python
- name: Export Environment
shell: bash -l {0}
run: |
mkdir -p .artifacts
filename=env_py${{ matrix.python-version }}_${{ matrix.os }}.yml
conda env export --no-builds | grep -v "prefix" > .artifacts/$filename
- name: Upload Artifacts
uses: actions/upload-artifact@v2
with:
name: os_py_environments
path: .artifacts/*
- name: Install package and test
shell: bash -l {0}
run: |
pip install .
python setup.py test
- name: Upload Coverage
shell: bash -l {0}
run: |
pip install coveralls && coveralls --service=github
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COVERALLS_FLAG_NAME: ${{ matrix.python-version }}
COVERALLS_PARALLEL: true
coveralls:
name: Submit Coveralls
needs: build
runs-on: ubuntu-latest
container: python:3-slim
steps:
- name: Finished
run: |
pip3 install --upgrade coveralls && coveralls --service=github --finish
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
33 changes: 33 additions & 0 deletions .github/workflows/upload_pypi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Upload pypi

on:
# trigger only on release
release:
types: [published]
# to trigger workflow manually from actions-tab
workflow_dispatch:

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: 3.6

- name: Upgrade pip, install setuptools, wheel and twine
run: |
# Upgrade pip
python -m pip install --upgrade pip
# Install build dependencies
python -m pip install setuptools wheel twine
- name: Build and Upload to pypi
run: |
python setup.py sdist bdist_wheel
python -m twine upload dist/*
env:
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
48 changes: 48 additions & 0 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: windows

on:
push:
pull_request:
schedule:
- cron: '0 0 * * *' # daily

jobs:
build:
name: Build py${{ matrix.python-version }} @ ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: ['3.6']
os: ['windows-latest']

steps:
- uses: actions/checkout@v2
with:
submodules: false # does not work with self-hosted testdata
- name: Checkout Testdata
shell: bash -l {0}
run : |
git submodule init
git submodule update
- uses: conda-incubator/setup-miniconda@v2.0.1
with:
miniconda-version: "latest"
auto-update-conda: true
python-version: ${{ matrix.python-version }}
environment-file: environment.yml
activate-environment: pytileproj_env
auto-activate-base: false
- name: Print environment infos
shell: bash -l {0}
run: |
conda info -a
conda list
pip list
which pip
which python
- name: Install package and test
shell: bash -l {0}
run: |
$env:GDAL_DATA="$env:GITHUB_WORKSPACE\gdal\data"
pip install .
python setup.py test
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
*.py[cod]
*.so
*.cfg
!.isort.cfg
!setup.cfg
*.orig
*.log
Expand All @@ -11,13 +12,16 @@ __pycache__/*
.cache/*
.*.swp
*/.ipynb_checkpoints/*
.DS_Store

# Project files
.ropeproject
.project
.pydevproject
.settings
.idea
.vscode
tags

# Package files
*.egg
Expand All @@ -31,12 +35,17 @@ htmlcov/*
.tox
junit.xml
coverage.xml
.pytest_cache/

# Build and docs folder/files
build/*
dist/*
sdist/*
docs/api/*
docs/_rst/*
docs/_build/*
cover/*
MANIFEST

# Per-project virtualenvs
.venv*/
46 changes: 0 additions & 46 deletions .travis.yml

This file was deleted.

6 changes: 3 additions & 3 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
==========
Developers
==========
============
Contributors
============

* Bernhard Bauer-Marschallinger <bernhard.bauer-marschallinger@geo.tuwien.ac.at>
* Sebastian Hahn <sebastian.hahn@geo.tuwien.ac.at>
59 changes: 35 additions & 24 deletions CHANGES.rst → CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,65 +2,76 @@
Changelog
=========

Version v0.0.12
===============
Version 0.0.14
==============

- Update pyscaffold 2.5.11 -> 3.3

Version 0.0.13
==============

- sets upperleft as default in ij2xy
- add offset-option to ij2xy() to fix position of returned coordinates

Version 0.0.12
==============

- bugfix in antimeridian handling

Version v0.0.11
===============
Version 0.0.11
==============

- extended search_tiles_in_roi()
- fixes issues with projection strings when using GDAL>=3.0.0

Version v0.0.10
===============
Version 0.0.10
==============

- fixed issues on antimeridian/dateline

Version v0.0.9
==============
Version 0.0.9
=============

- minor update on lonlat2xy functions

Version v0.0.8
==============
Version 0.0.8
=============

- minor update on tilesystem functions

Version v0.0.7
==============
Version 0.0.7
=============

- Includes now the support for the UTM grid

Version v0.0.6
==============
Version 0.0.6
=============

- Fix pep8
- Update copyright year
- Fix import issues

Version v0.0.5
==============
Version 0.0.5
=============

- ...

Version v0.0.4
==============
Version 0.0.4
=============

- ...

Version v0.0.3
==============
Version 0.0.3
=============

- ...

Version v0.0.2
==============
Version 0.0.2
=============

- ...

Version v0.0.1
==============
Version 0.0.1
=============

- First draft
4 changes: 2 additions & 2 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License
The MIT License (MIT)

Copyright (c) 2020 TU Wien - Department of Geodesy and Geoinformation
Copyright (c) 2021 TU Wien, Department of Geodesy and Geoinformation

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
11 changes: 7 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
pytileproj
==========

.. image:: https://travis-ci.org/TUW-GEO/pytileproj.svg?branch=master
:target: https://travis-ci.org/TUW-GEO/pytileproj
.. image:: https://github.com/TUW-GEO/pytileproj/workflows/ubuntu/badge.svg
:target: https://github.com/TUW-GEO/pytileproj/actions/workflows/ubuntu.yml

.. image:: https://github.com/TUW-GEO/pytileproj/workflows/windows/badge.svg
:target: https://github.com/TUW-GEO/pytileproj/actions/workflows/windows.yml

.. image:: https://coveralls.io/repos/github/TUW-GEO/pytileproj/badge.svg?branch=master
:target: https://coveralls.io/github/TUW-GEO/pytileproj?branch=master
Expand Down Expand Up @@ -104,5 +107,5 @@ If you want to contribute please follow these steps:
Note
====

This project has been set up using PyScaffold 2.5.11. For details and usage
information on PyScaffold see http://pyscaffold.readthedocs.org/.
This project has been set up using PyScaffold 3.3. For details and usage
information on PyScaffold see https://pyscaffold.org/.

0 comments on commit c9a1bd7

Please sign in to comment.