[pyepr] 01/04: Imported Upstream version 0.9.3

Antonio Valentino a_valentino-guest at moszumanska.debian.org
Sun May 3 07:52:46 UTC 2015


This is an automated email from the git hooks/post-receive script.

a_valentino-guest pushed a commit to branch master
in repository pyepr.

commit c25abc83f7b842e8d712f2956b592aa86dcac472
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sun May 3 07:41:38 2015 +0000

    Imported Upstream version 0.9.3
---
 Makefile                |  2 +-
 README.txt              |  2 +-
 doc/NEWS.txt            |  6 ++++++
 doc/bands_example.txt   |  2 +-
 doc/bitmask_example.txt |  2 +-
 doc/conf.py             |  4 ++--
 doc/index.txt           |  7 ++++---
 doc/usermanual.txt      | 10 +++++-----
 setup.py                |  3 ++-
 src/epr.pyx             |  2 +-
 10 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 5ab584d..2a46c05 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@
 # along with PyEPR.  If not, see <http://www.gnu.org/licenses/>.
 
 PYTHON = python3
-CYTHON = cython
+CYTHON = cython3
 TEST_DATSET_URL = "http://earth.esa.int/services/sample_products/meris/LRC/L2/MER_LRC_2PTGMV20000620_104318_00000104X000_00000_00000_0001.N1.gz"
 TEST_DATSET = tests/MER_LRC_2PTGMV20000620_104318_00000104X000_00000_00000_0001.N1
 
diff --git a/README.txt b/README.txt
index dd1895c..c29fb92 100644
--- a/README.txt
+++ b/README.txt
@@ -6,7 +6,7 @@ ENVISAT Product Reader Python API
 :Author:    Antonio Valentino
 :Contact:   antonio.valentino at tiscali.it
 :Copyright: 2011-2015, Antonio Valentino <antonio.valentino at tiscali.it>
-:Version:   0.9.2
+:Version:   0.9.3
 
 
 Introduction
diff --git a/doc/NEWS.txt b/doc/NEWS.txt
index 08946e2..1621e82 100644
--- a/doc/NEWS.txt
+++ b/doc/NEWS.txt
@@ -1,6 +1,12 @@
 Change history
 ==============
 
+PyEPR 0.9.3 (02/05/2015)
+------------------------
+
+* Fix PyEprExtension class in setup.py (closes :issue:`11`)
+* Updated internal EPR API version
+
 
 PyEPR 0.9.2 (08/03/2015)
 ------------------------
diff --git a/doc/bands_example.txt b/doc/bands_example.txt
index 27df85f..dccf8c3 100644
--- a/doc/bands_example.txt
+++ b/doc/bands_example.txt
@@ -201,4 +201,4 @@ powerful :class:`numpy.ndarray` interface.
 
 .. raw:: latex
 
-   \clearpage0+++++
+   \clearpage
diff --git a/doc/bitmask_example.txt b/doc/bitmask_example.txt
index 0b05919..f57eebe 100644
--- a/doc/bitmask_example.txt
+++ b/doc/bitmask_example.txt
@@ -1,7 +1,7 @@
 Exporting bitmasks
 -------------------
 
-..index:: bitmask, ENVISAT
+.. index:: bitmask, ENVISAT
 
 This tutorial shows how to generate bit masks from ENVISAT_ flags information
 as "raw" image using PyEPR_.
diff --git a/doc/conf.py b/doc/conf.py
index 5272fce..3d21ca8 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -68,9 +68,9 @@ copyright = u'2011-2015, Antonio Valentino'
 # built documents.
 #
 # The short X.Y version.
-version = '0.9.2'
+version = '0.9.3'
 # The full version, including alpha/beta/rc tags.
-release = version  # + 'dev'
+release = version + '.dev0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/doc/index.txt b/doc/index.txt
index 605d346..f162d93 100644
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -60,7 +60,8 @@ ENVISAT Product Reader Python API
     Online documentation for other PyEpr_ versions:
 
     * `latest <https://pyepr.readthedocs.org/en/latest/>`_ development
-    * `0.9.2 <https://pyepr.readthedocs.org/en/v0.9.2/>`_ (latest stable)
+    * `0.9.3 <https://pyepr.readthedocs.org/en/v0.9.3/>`_ (latest stable)
+    * `0.9.2 <https://pyepr.readthedocs.org/en/v0.9.2/>`_
     * `0.9.1 <https://pyepr.readthedocs.org/en/v0.9.1/>`_
     * `0.9 <https://pyepr.readthedocs.org/en/v0.9/>`_
     * `0.8.2 <https://pyepr.readthedocs.org/en/v0.8.2/>`_
@@ -72,11 +73,11 @@ ENVISAT Product Reader Python API
     * `0.6 <https://pyepr.readthedocs.org/en/v0.6/>`_
 
 
-.. index:: license
-
 License
 =======
 
+.. index:: license
+
 Copyright (C) 2011-2015 Antonio Valentino <antonio.valentino at tiscali.it>
 
 PyEPR is free software: you can redistribute it and/or modify
diff --git a/doc/usermanual.txt b/doc/usermanual.txt
index 87fe071..5a8fab3 100644
--- a/doc/usermanual.txt
+++ b/doc/usermanual.txt
@@ -201,7 +201,7 @@ if it is not already available in the :file:`tests` directory.
    please note that, unless the user already have a copy of the specified
    sample product correctly installed, an **internet connection** is
    necessary the first time that the test suite is run.
-   
+
    After the first run the sample product remains in the :file:`tests`
    directory so the internet access is no longer necessary.
 
@@ -253,7 +253,7 @@ For example: the C `EPR_DatasetId` structure has a field (`product_id`)
 that points to the *product* descriptor `EPR_productId` to which it
 belongs to.
 
-..index:: dataset, record
+.. index:: dataset, record
 
 The reference to the parent product is used, for example, when one wants
 to read a record using the `epr_read_record` function:
@@ -362,7 +362,7 @@ exposed to python.
 Internal library logging is completely silenced and errors are converted
 to Python_ exceptions.
 Where appropriate standard Python_ exception types are use in other cases
-custom exception types (e.g. :exc:`epr.EPRError`, :exc:`epr.EPRValueError`) 
+custom exception types (e.g. :exc:`epr.EPRError`, :exc:`epr.EPRValueError`)
 are used.
 
 
@@ -407,7 +407,7 @@ Another example::
         print(band)
 
 
-.. index:: __str__, __repr__, print_, 
+.. index:: __str__, __repr__, print_,
    pair: special; methods
 
 Special methods
@@ -436,7 +436,7 @@ giver the same result of::
 Of course the :meth:`epr.Record.print_` method is more efficient for writing
 to file.
 
-..index:: __iter__
+.. index:: __iter__
 
 Also :class:`epr.Dataset` and :class:`epr.Record` classes implement the
 ``__iter__`` `special method`_ for iterating over records and fields
diff --git a/setup.py b/setup.py
index 6b7ca9c..82729a8 100755
--- a/setup.py
+++ b/setup.py
@@ -41,7 +41,6 @@ def get_use_setuptools():
     use_setuptools = os.environ.get('USE_SETUPTOOLS', True)
     if str(use_setuptools).lower() in ('false', 'off', 'n', 'no', '0'):
         use_setuptools = False
-        print('USE_SETUPTOOLS: {}'.format(use_setuptools))
     else:
         use_setuptools = True
 
@@ -130,6 +129,8 @@ class PyEprExtension(Extension, object):
                 else:
                     self.setup_requires_cython = True
                     sources.append(src)
+            else:
+                sources.append(src)
 
         if not self.setup_requires_cython:
             self.sources = sources
diff --git a/src/epr.pyx b/src/epr.pyx
index c57a129..facf9ef 100644
--- a/src/epr.pyx
+++ b/src/epr.pyx
@@ -41,7 +41,7 @@ in a product file.
 
 '''
 
-__version__ = '0.9.2'
+__version__ = '0.9.3'
 
 from libc cimport errno
 from libc cimport stdio

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pyepr.git



More information about the Pkg-grass-devel mailing list