.gitattributes

-*.py ident
-*.pyx ident
-*.px[di] ident
-*.txt ident
-

.travis.yml

@@ -7,8 +7,9 @@ python:
   - "3.4"
   - "3.5"
   - "3.6"
-  - "3.7-dev"
-  # "pypy2.7"
+  # - "3.7"
+  # - "3.8-dev"
+  # - "pypy2.7"
   - "pypy3.5"
 
 before_install:
@@ -17,7 +18,7 @@ before_install:
 
 install:
   - pip install -r requirements.txt
-  - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install -U unittest2; fi
+  - if [[ $TRAVIS_PYTHON_VERSION < '3.4' ]]; then pip install -U unittest2; fi
   - python setup.py build_ext --inplace
 
 script: make PYTHON=python check

MANIFEST.in

@@ -7,7 +7,7 @@ recursive-include tests *.py
 recursive-include src *.pyx *.pxd *.c
 recursive-include epr-api-src *.c *.h
 
-recursive-include doc *.txt *.py Makefile make.bat *.png
+recursive-include doc *.rst *.txt *.py Makefile make.bat *.png
 recursive-include doc/_templates *.html
 recursive-include doc/pydoctheme *
 recursive-include doc/html *

Makefile

@@ -26,7 +26,7 @@ TEST_DATSET = tests/MER_LRC_2PTGMV20000620_104318_00000104X000_00000_00000_0001.
 EPRAPIROOT = ../epr-api
 
 .PHONY: default ext cythonize sdist eprsrc fullsdist doc clean distclean \
-        check debug data upload
+        check debug data upload manylinux
 
 default: ext
 
@@ -69,6 +69,7 @@ clean:
 	$(RM) MANIFEST src/*.c src/*.o *.so
 	$(RM) tests/*.py[co] doc/sphinxext/*.py[co] README.html
 	$(MAKE) -C doc clean
+	$(RM) -r doc/_build
 	find . -name '*~' -delete
 
 distclean: clean
@@ -88,3 +89,8 @@ data: $(TEST_DATSET)
 $(TEST_DATSET):
 	wget -P tests $(TEST_DATSET_URL)
 	gunzip $@
+
+manylinux:
+	# make fullsdist
+	# docker pull quay.io/pypa/manylinux1_x86_64
+	docker run --rm -v $(shell pwd):/io quay.io/pypa/manylinux1_x86_64 sh /io/build-manylinux-wheels.sh

README.txt → README.rst

@@ -6,7 +6,7 @@ ENVISAT Product Reader Python API
 :Author:    Antonio Valentino
 :Contact:   antonio.valentino@tiscali.it
 :Copyright: 2011-2018, Antonio Valentino <antonio.valentino@tiscali.it>
-:Version:   0.9.4
+:Version:   0.9.5
 
 
 Introduction
@@ -41,11 +41,11 @@ correctly installed and configured:
   with a copy of the PER C API sources)
 * a reasonably updated C compiler (build only)
 * Cython_ >= 0.15 (build only)
-* unittest2_ (only required for Python < 2.7)
+* unittest2_ (only required for Python < 3.4)
 
 .. _Python2: Python_
 .. _Python3: Python_
-.. _PyPy: http://pypy.orgv
+.. _PyPy: http://pypy.org
 .. _numpy: http://www.numpy.org
 .. _gcc: http://gcc.gnu.org
 .. _Cython: http://cython.org

appveyor.yml

+# AppVeyor.com is a Continuous Integration service to build and run tests under
+# Windows
+#
+# See also: https://github.com/astropy/astropy/blob/master/appveyor.yml
+
+environment:
+
+  global:
+    PYTHON: "C:\\conda"
+    MINICONDA_VERSION: "latest"
+    CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\ci-helpers\\appveyor\\windows_sdk.cmd"
+    # PYTHON_ARCH: "64" # needs to be set for CMD_IN_ENV to succeed. If a mix
+                        # of 32 bit and 64 bit builds are needed, move this
+                        # to the matrix section.
+    CONDA_DEPENDENCIES: "setuptools numpy Cython unittest2"
+    # DEBUG: True
+    # NUMPY_VERSION: "stable"
+
+
+  matrix:
+    - platform: x86
+      PYTHON_VERSION: "2.7"
+      PYTHON_ARCH: "32"
+
+    - PYTHON_VERSION: "2.7"
+      PYTHON_ARCH: "64"
+
+    - platform: x86
+      PYTHON_VERSION: "3.4"
+      PYTHON_ARCH: "32"
+
+    - PYTHON_VERSION: "3.4"
+      PYTHON_ARCH: "64"
+
+    - platform: x86
+      PYTHON_VERSION: "3.5"
+      PYTHON_ARCH: "32"
+
+    - PYTHON_VERSION: "3.5"
+      PYTHON_ARCH: "64"
+
+    - platform: x86
+      PYTHON_VERSION: "3.6"
+      PYTHON_ARCH: "32"
+
+    - PYTHON_VERSION: "3.6"
+      PYTHON_ARCH: "64"
+
+    - platform: x86
+      PYTHON_VERSION: "3.7"
+      PYTHON_ARCH: "32"
+
+    - PYTHON_VERSION: "3.7"
+      PYTHON_ARCH: "64"
+
+install:
+    # conda
+    - "git clone git://github.com/astropy/ci-helpers.git"
+    - "powershell ci-helpers/appveyor/install-miniconda.ps1"
+    - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
+    - "activate test"
+    # epr-api
+    - "git clone -b pyepr https://github.com/avalentino/epr-api.git"
+
+# Not a .NET project, we build the python package in the install step instead
+build: false
+
+test_script:
+  # Build the compiled extension and run the project tests
+  - "%CMD_IN_ENV% python setup.py --epr-api-src=epr-api\\src test"
+
+after_test:
+  # If tests are successful, create a whl package for the project.
+  - "%CMD_IN_ENV% python setup.py --epr-api-src=epr-api\\src bdist_wheel"
+
+artifacts:
+  # Archive the generated wheel package in the ci.appveyor.com build report.
+  - path: dist\*
+
+#on_success:
+#  - TODO: upload the content of dist/*.whl to a public wheelhouse

build-manylinux-wheels.sh

+#!/bin/bash
+# Based on: https://github.com/pypa/python-manylinux-demo 9700d97 17 Dec 2016
+#
+# It is assumed that the docker image has been run as follows::
+#
+#   $ make fullsdist
+#   $ docker pull quay.io/pypa/manylinux1_x86_64
+#   $ docker run --rm -v $(pwd):/io quay.io/pypa/manylinux1_x86_64 /io/build-manylinux-wheels.sh
+#
+# For interactive sessions please use::
+#
+#   $ make fullsdist
+#   $ docker pull quay.io/pypa/manylinux1_x86_64
+#   $ docker run -it -v $(pwd):/io quay.io/pypa/manylinux1_x86_64
+#   $ cd /io
+#   $ sh build-manylinux-wheels.sh
+
+set -e -x
+
+PKG=pyepr
+
+# Compile wheels
+for PYBIN in /opt/python/*/bin; do
+    "${PYBIN}/pip" install -r /io/requirements.txt
+    "${PYBIN}/pip" wheel /io/dist/${PKG}*.tar.gz -w wheelhouse/
+done
+
+# Bundle external shared libraries into the wheels
+for whl in wheelhouse/${PKG}*.whl; do
+    auditwheel repair "${whl}" -w /io/wheelhouse/
+done
+
+# Install packages and test
+for PYBIN in /opt/python/*/bin/; do
+    "${PYBIN}/pip" install ${PKG} --no-index -f /io/wheelhouse
+    "${PYBIN}/python" /io/tests/test_all.py -v
+done

debian/changelog

+pyepr (0.9.5-1) unstable; urgency=medium
+
+  * New upstream release.
+  * debian/patches
+    - refresh all patches
+  * Drop debian/python3-epr-dbg.lintian-overrides: no longer necessary.
+
+ -- Antonio Valentino <antonio.valentino@tiscali.it>  Thu, 23 Aug 2018 20:23:29 +0000
+
 pyepr (0.9.4-3) unstable; urgency=medium
 
   * Team upload.

debian/patches/0001-Only-use-local-files-for-generating-sphinx-doc.patch

@@ -11,7 +11,7 @@ happens any longer (Closes: #726859).
  1 file changed, 8 insertions(+), 6 deletions(-)
 
 diff --git a/doc/conf.py b/doc/conf.py
-index 0c23523..795fd91 100644
+index 84d729f..148502f 100644
 --- a/doc/conf.py
 +++ b/doc/conf.py
 @@ -139,10 +139,10 @@ html_sidebars = {

debian/python-epr-doc.docs

-README.txt
+README.rst
 doc/html

debian/python3-epr-dbg.lintian-overrides

-# False positive, string not included in source
-spelling-error-in-binary * lIK link
-

debian/rules

@@ -61,11 +61,11 @@ override_dh_strip:
 
 
 override_dh_installchangelogs:
-	dh_installchangelogs -k doc/NEWS.txt
+	dh_installchangelogs -k doc/NEWS.rst
 
 
 override_dh_compress:
-	dh_compress -X.txt -X.html -X.py
+	dh_compress -X.txt -X.rst -X.html -X.py
 
 
 override_dh_sphinxdoc:

doc/NEWS.txt → doc/NEWS.rst

 Change history
 ==============
 
+PyEPR 0.9.5 (23/08/2018)
+------------------------
+
+* Fix compatibility with numpy >= 1.14: :func:`np.fromstring`
+  is deprecated.
+* Update the pypi sidebar in the documentation
+* Use `.rst` extension for doc source files
+* Fix setup script to not use system libs if epr-api sources are available
+* Do not access fields of bands after that the product has been closed
+  (fix a segmentation fault on windows)
+* `unittest2`_ is now required for Python < 3.4
+
+.. _unittest2: https://pypi.org/project/unittest2
+
+
 PyEPR 0.9.4 (29/04/2018)
 ------------------------
 

doc/_templates/appveyor.html

 <div>
 <p>
-<a href="https://ci.appveyor.com/project/avalentino/pyepr"><img src="https://ci.appveyor.com/api/projects/status/pno3t4bwf3pwqdwi?svg=true" alt="AppVeyor status page"/></a>
+<a href="https://ci.appveyor.com/project/avalentino/pyepr"><img src="https://ci.appveyor.com/api/projects/status/xy8sb0tso761ths5?svg=true" alt="AppVeyor status page"/></a>
 </p>
 </div>

doc/_templates/pypi.html

 <div>
 <p>
-<a href="https://pypi.python.org/pypi/pyepr"><img src="https://pypip.in/version/pyepr/badge.svg" alt="Latest Version"/></a>
+<a href="https://pypi.org/project/pyepr"><img src="https://img.shields.io/pypi/v/pyepr.svg" alt="Latest Version"/></a>
 </p>
 <p>
-<a href="https://pypi.python.org/pypi/pyepr"><img src="https://pypip.in/py_versions/pyepr/badge.svg" alt="Supported Python versions"/></a>
+<a href="https://pypi.org/project/pyepr"><img src="https://img.shields.io/pypi/pyversions/pyepr.svg" alt="Supported Python versions"/></a>
 </p>
 <p>
-<a href="https://pypi.python.org/pypi/pyepr"><img src="https://pypip.in/license/pyepr/badge.svg" alt="License"/></a>
+<a href="https://pypi.org/project/pyepr"><img src="https://img.shields.io/pypi/l/pyepr.svg" alt="License"/></a>
 </p>
 <p>
-<a href="https://pypi.python.org/pypi/pyepr"><img src="https://pypip.in/download/pyepr/badge.svg" alt="Downloads"/></a>
-</p>
-<p>
-<a href="https://pypi.python.org/pypi/pyepr"><img src="https://pypip.in/wheel/pyepr/badge.svg" alt="Wheel Status"/></a>
+<a href="https://pypi.org/project/pyepr"><img src="https://img.shields.io/pypi/wheel/pyepr.svg" alt="Wheel Status"/></a>
 </p>
 </div>

doc/conf.py

@@ -58,7 +58,7 @@ templates_path = ['_templates']
 # You can specify multiple suffix as a list of string:
 #
 # source_suffix = ['.rst', '.md']
-source_suffix = '.txt'
+source_suffix = '.rst'
 
 # The master toctree document.
 master_doc = 'index'
@@ -73,9 +73,9 @@ author = u'Antonio Valentino'
 # built documents.
 #
 # The short X.Y version.
-version = '0.9.4'
+version = '0.9.5'
 # The full version, including alpha/beta/rc tags.
-release = version  # + '.dev0'
+release = version + '.dev0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/gdal_export_example.txt → doc/gdal_export_example.rst

@@ -225,7 +225,7 @@ Complete listing
    :language: python
 
 
-.. _GDAL: http://www.gdal.org
+.. _GDAL: https://www.gdal.org
 .. _PyEPR: https://github.com/avalentino/pyepr
 .. _ENVISAT: https://envisat.esa.int
 

doc/index.txt → doc/index.rst

@@ -60,7 +60,8 @@ ENVISAT Product Reader Python API
     Online documentation for other PyEpr_ versions:
 
     * `latest <https://pyepr.readthedocs.io/en/latest/>`_ development
-    * `0.9.4 <https://pyepr.readthedocs.io/en/v0.9.4/>`_ (latest stable)
+    * `0.9.5 <https://pyepr.readthedocs.io/en/v0.9.5/>`_ (latest stable)
+    * `0.9.4 <https://pyepr.readthedocs.io/en/v0.9.4/>`_
     * `0.9.3 <https://pyepr.readthedocs.io/en/v0.9.3/>`_
     * `0.9.2 <https://pyepr.readthedocs.io/en/v0.9.2/>`_
     * `0.9.1 <https://pyepr.readthedocs.io/en/v0.9.1/>`_