Merge pull request #22 from TUW-GEO/develop

Update pyscaffold
TUW-GEO · Mar 18, 2021 · 4effe4e · 4effe4e
2 parents a79ba5e + 6ce2199
commit 4effe4e
Show file tree

Hide file tree

Showing 530 changed files with 570 additions and 541 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -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 =

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -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/[email protected]
+        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 }}
diff --git a/.github/workflows/upload_pypi.yml b/.github/workflows/upload_pypi.yml
@@ -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 }}
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -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/[email protected]
+        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: |
+          pip install pytest==3.8.2 pytest-cov coverage==4.5.2
+          pip install .
+          python setup.py test
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 *.py[cod]
 *.so
 *.cfg
+!.isort.cfg
 !setup.cfg
 *.orig
 *.log
@@ -11,13 +12,16 @@ __pycache__/*
 .cache/*
 .*.swp
 */.ipynb_checkpoints/*
+.DS_Store
 
 # Project files
 .ropeproject
 .project
 .pydevproject
 .settings
 .idea
+.vscode
+tags
 
 # Package files
 *.egg
@@ -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*/
diff --git a/.travis.yml b/.travis.yml
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -1,6 +1,6 @@
-==========
-Developers
-==========
+============
+Contributors
+============
 
 * Bernhard Bauer-Marschallinger <[email protected]>
 * Sebastian Hahn <[email protected]>
diff --git a/CHANGES.rst → CHANGELOG.rst b/CHANGES.rst → CHANGELOG.rst
@@ -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
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -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

diff --git a/README.rst b/README.rst
@@ -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
@@ -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/.