Update docs, travis, dependencies

.travis.yml

@@ -9,19 +9,15 @@ addons:
  - gcc
 python:
  # We don't actually use the Travis Python, but this keeps it organized.
- - "2.7"
  - "3.6"
  - "3.7"
+ - "3.8"
 install:
  # You may want to periodically update this, although the conda update
  # conda line below will keep everything up-to-date. We do this
  # conditionally because it saves us some downloading if the version is
  # the same.
- - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
- wget http:https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh;
- else
- wget http:https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
- fi
+ - wget http:https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
  - bash miniconda.sh -b -p $HOME/miniconda
  - export PATH="$HOME/miniconda/bin:$PATH"
  - hash -r
@@ -45,3 +41,17 @@ after_success:
  # report coverage results to coveralls.io
  - pip install coveralls
  - coveralls
+deploy:
+ provider: pypi
+ # better than hiding the token would be to encrypt it with travis...
+ username: __token__
+ password: $PYPI_TOKEN
+ skip_existing: true
+ on:
+ repo: TUW-GEO/repurpose
+ tags: true
+after_deploy:
+ # try install as in docs
+ - conda create -q -n repurpose_deploy --yes python=3.7
+ - source activate repurpose_deploy
+ - pip install repurpose

AUTHORS.rst

@@ -3,3 +3,4 @@ Contributors
 ============
 
 * Christoph Paulik <[email protected]>
+* Wolfgang Preimesberger <[email protected]>

CHANGELOG.rst

@@ -5,6 +5,18 @@ Changelog
 Unreleased
 ==========
 
+-
+
+Version 0.8
+===========
+
+- Update pyscaffold package structure (pyscaffold 3)
+- Drop py2 support
+- Add pypi deployment to travis.
+
+Version 0.7
+===========
+
 - Add resample functions (from pytesmo)
 
 Version 0.6

LICENSE.txt

@@ -1,27 +1,26 @@
-Copyright (c) 2015, Christoph Paulik
+Copyright (c) 2020, TU Wien, Department of Geodesy and Geoinformation
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-* Neither the name of repurpose nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of TU Wien, Department of Geodesy and Geoinformation
+ nor the names of its contributors may be used to endorse or promote
+ products derived from this software without specific prior written
+ permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL TU WIEN DEPARTMENT OF GEODESY AND
+GEOINFORMATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

docs/conf.py

@@ -82,7 +82,7 @@
 
 # General information about the project.
 project = u'repurpose'
-copyright = u'2019, Wolfgang Preimesberger'
+copyright = u'2019, TU Wien'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -135,7 +135,7 @@
 
 # The theme to use for HTML and HTML Help pages. See the documentation for
 # a list of builtin themes.
-html_theme = 'alabaster'
+html_theme = 'sphinx_rtd_theme'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further. For a list of options available for each theme, see the

docs/index.rst

@@ -1,37 +1,17 @@
-=========
-repurpose
-=========
-
-This is the documentation of **repurpose**.
-
-.. note::
-
- This is the main page of your project's `Sphinx`_ documentation.
- It is formatted in `reStructuredText`_. Add additional pages
- by creating rst-files in ``docs`` and adding them to the `toctree`_ below.
- Use then `references`_ in order to link them from this page, e.g.
- :ref:`authors` and :ref:`changes`.
-
- It is also possible to refer to the documentation of other Python packages
- with the `Python domain syntax`_. By default you can reference the
- documentation of `Sphinx`_, `Python`_, `NumPy`_, `SciPy`_, `matplotlib`_,
- `Pandas`_, `Scikit-Learn`_. You can add more by extending the
- ``intersphinx_mapping`` in your Sphinx's ``conf.py``.
-
- The pretty useful extension `autodoc`_ is activated by default and lets
- you include documentation from docstrings. Docstrings can be written in
- `Google style`_ (recommended!), `NumPy style`_ and `classical style`_.
-
+.. include:: ../README.rst
+.. include:: ts2img.rst
+.. include:: resample.rst
 
 Contents
 ========
 
 .. toctree::
  :maxdepth: 2
 
+ Time Series to Images <ts2img>
+ Spatial Resampling <resample>
  License <license>
  Authors <authors>
- Changelog <changelog>
  Module Reference <api/modules>
 
 
@@ -41,19 +21,3 @@ Indices and tables
 * :ref:`genindex`
 * :ref:`modindex`
 * :ref:`search`
-
-.. _toctree: http:https://www.sphinx-doc.org/en/master/usage/restructuredtext/directives.html
-.. _reStructuredText: http:https://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html
-.. _references: http:https://www.sphinx-doc.org/en/stable/markup/inline.html
-.. _Python domain syntax: http:https://sphinx-doc.org/domains.html#the-python-domain
-.. _Sphinx: http:https://www.sphinx-doc.org/
-.. _Python: http:https://docs.python.org/
-.. _Numpy: http:https://docs.scipy.org/doc/numpy
-.. _SciPy: http:https://docs.scipy.org/doc/scipy/reference/
-.. _matplotlib: https://matplotlib.org/contents.html#
-.. _Pandas: http:https://pandas.pydata.org/pandas-docs/stable
-.. _Scikit-Learn: http:https://scikit-learn.org/stable
-.. _autodoc: http:https://www.sphinx-doc.org/en/stable/ext/autodoc.html
-.. _Google style: https://github.com/google/styleguide/blob/gh-pages/pyguide.md#38-comments-and-docstrings
-.. _NumPy style: https://numpydoc.readthedocs.io/en/latest/format.html
-.. _classical style: http:https://www.sphinx-doc.org/en/stable/domains.html#info-field-lists

docs/requirements.txt

@@ -0,0 +1 @@
+sphinx_rtd_theme

environment.yml

@@ -6,10 +6,9 @@ channels:
  - defaults
 dependencies:
  - numpy
- - scipy
  - pip
  - pip:
  - pygeogrids
  - pynetcf
  - pyresample
- - more_itertools
+ - more_itertools

readthedocs.yml

@@ -1,4 +1,4 @@
 python:
  version: 3
  pip_install: true
-requirements_file: doc_requirements.txt
+requirements_file: docs/requirements.txt

setup.cfg

@@ -5,14 +5,14 @@
 [metadata]
 name = repurpose
 description = Package for image to timeseries to image conversion
-author = Wolfgang Preimesberger
-author-email = wolfgang.preimesberger@geo.tuwien.ac.at
+author = TU Wien
+author-email = remote.sensing@geo.tuwien.ac.at
 license = mit
 long-description = file: README.rst
 long-description-content-type = text/x-rst; charset=UTF-8
-url = https://github.com/pyscaffold/pyscaffold/
+url = https://repurpose.readthedocs.io/en/latest/
 project-urls =
- Documentation = https://pyscaffold.org/
+ Documentation = https://repurpose.readthedocs.io/en/latest/
 # Change if running only on Windows, Mac or Linux (comma-separated)
 platforms = any
 # Add here all kinds of additional classifiers as defined under
@@ -30,11 +30,11 @@ package_dir =
 # DON'T CHANGE THE FOLLOWING LINE! IT WILL BE UPDATED BY PYSCAFFOLD!
 setup_requires = pyscaffold>=3.2a0,<3.3a0
 # Add here dependencies of your project (semicolon/line-separated), e.g.
-# install_requires = numpy; scipy
+install_requires = numpy; pygeogrids; pynetcf; pyresample; more_itertools
 # The usage of test_requires is discouraged, see `Dependency Management` docs
 # tests_require = pytest; pytest-cov
 # Require a specific Python version, e.g. Python 2.7 or >= 3.4
-# python_requires = >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*
+python_requires = >=3.6
 
 [options.packages.find]
 where = src

src/repurpose/img2ts.py

@@ -1,36 +1,29 @@
-# Copyright (c) 2014,Vienna University of Technology, Department of Geodesy
-# and Geoinformation
+# Copyright (c) 2020, TU Wien, Department of Geodesy and Geoinformation
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
+#  * Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
 # * Redistributions in binary form must reproduce the above copyright
 # notice, this list of conditions and the following disclaimer in the
 # documentation and/or other materials provided with the distribution.
-# * Neither the name of the Vienna University of Technology, Department of
-# Geodesy and Geoinformation nor the names of its contributors may be
-# used to endorse or promote products derived from this software without
-# specific prior written permission.
-
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL VIENNA UNIVERSITY OF TECHNOLOGY,
-# DEPARTMENT OF GEODESY AND GEOINFORMATION BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-'''
-Created on Mar 17, 2014
-
-@author: Christoph Paulik [email protected]
-'''
+# * Neither the name of TU Wien, Department of Geodesy and Geoinformation
+# nor the names of its contributors may be used to endorse or promote
+# products derived from this software without specific prior written
+# permission.
+
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL TU WIEN DEPARTMENT OF GEODESY AND
+# GEOINFORMATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 import pynetcf.time_series as nc

src/repurpose/resample.py

@@ -1,34 +1,29 @@
-# Copyright (c) 2014,Vienna University of Technology, Department of Geodesy and Geoinformation
+# Copyright (c) 2020, TU Wien, Department of Geodesy and Geoinformation
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
+#  * Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
 # * Redistributions in binary form must reproduce the above copyright
 # notice, this list of conditions and the following disclaimer in the
 # documentation and/or other materials provided with the distribution.
-# * Neither the name of the Vienna University of Technology, Department of Geodesy and Geoinformation nor the
-# names of its contributors may be used to endorse or promote products
-# derived from this software without specific prior written permission.
-
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL VIENNA UNIVERSITY OF TECHNOLOGY,
-# DEPARTMENT OF GEODESY AND GEOINFORMATION BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-'''
-Created on Mar 25, 2014
-
-@author: Christoph Paulik [email protected]
-'''
+# * Neither the name of TU Wien, Department of Geodesy and Geoinformation
+# nor the names of its contributors may be used to endorse or promote
+# products derived from this software without specific prior written
+# permission.
+
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL TU WIEN DEPARTMENT OF GEODESY AND
+# GEOINFORMATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 from pyresample import geometry, kd_tree