Merge remote-tracking branch 'origin/v1.3.x'

.gitignore

@@ -18,3 +18,4 @@ dist
 *.tmp*
 .coverage
 MANIFEST
+.cache/

.travis.yml

@@ -4,14 +4,14 @@ sudo: false
 
 env:
     global:
-        - PACKAGES_STANDARD="setuptools numpy nose pep8 coverage"
+        - PACKAGES_STANDARD="setuptools numpy pytest pycodestyle"
     matrix:
         - NAME="Python 2.7 (standard)"
           PYTHON_VERSION=2.7
           PACKAGES="${PACKAGES_STANDARD}"
         - NAME="Python 2.7 (metadata)"
           PYTHON_VERSION=2.7
-          PACKAGES="${PACKAGES_STANDARD} cdat-lite iris xarray"
+          PACKAGES="${PACKAGES_STANDARD} cdms2 genutil iris xarray"
         - NAME="Python 3.4 (standard)"
           PYTHON_VERSION=3.4
           PACKAGES="${PACKAGES_STANDARD}"
@@ -59,7 +59,8 @@ script:
     # installed package rather than the source:
     - mkdir ../test_directory
     - cd ../test_directory
-    - nosetests eofs --verbosity=2 --with-coverage --cover-package=eofs
+    - export UVCDAT_ANONYMOUS_LOG=no
+    - pytest -vrsx --pyargs eofs
 
 notifications:
     email: false

doc/changelog.rst

@@ -4,6 +4,16 @@ Changelog
 .. default-role:: py:obj
 
 
+v1.3
+----
+
+:Release: v1.3.0
+:Date: 12 October 2017
+
+* Minor change for xarray deprecations resulting in a different xarray version dependency (now >= 0.9) [`#87 <https://github.com/ajdawson/eofs/pull/87>`_].
+* Bug fixes for Python 3 [`#88 <https://github.com/ajdawson/eofs/pull/88>`_].
+
+
 v1.2
 ----
 

doc/conf.py

@@ -18,7 +18,7 @@
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.append(os.path.abspath('sphinxext'))
+# sys.path.append(os.path.abspath('sphinxext'))
 
 # -- General configuration -----------------------------------------------------
 
@@ -32,7 +32,7 @@
               'sphinx.ext.viewcode',
               'sphinx.ext.autosummary',
               'sphinx.ext.intersphinx',
-              'plot_directive',]
+              'matplotlib.sphinxext.plot_directive',]
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -201,8 +201,12 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('userguide', 'userguide.tex', 'eofs User Guide',
-   'Andrew Dawson', 'manual'),
+  ('userguide/index', 'userguide.tex', 'eofs User Guide', 'Andrew Dawson',
+   'manual'),
+  ('examples/index', 'examples.tex', 'eofs Examples', 'Andrew Dawson',
+   'manual'),
+  ('api/index', 'api.tex', 'eofs API Reference', 'Andrew Dawson',
+   'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of

doc/devguide/testing.rst

@@ -5,7 +5,7 @@ The package comes with a comprehensive set of tests to make sure it is working c
 The tests can be run against an installed version of `eofs` or against the current source tree.
 Testing against the source tree is handy during development when quick iteration is required, but for most other cases testing against the installed version is more suitable.
 
-Running the test suite requires nose_ and pep8_ to be installed.
+Running the test suite requires pytest_ and pycodestyle_ to be installed.
 The test suite will function as long as the minimum dependencies for the package are installed, but some tests will be skipped if they require optional dependencies that are not present.
 To run the full test suite you need to have the optional dependencies `cdms2` (from UV-CDAT_), iris_, and xarray_ installed.
 
@@ -14,7 +14,7 @@ Testing against the current source tree
 
 Testing the current source is straightforward, from the source directory run::
 
-    nosetests -sv
+    pytest
 
 This will perform verbose testing of the current source tree and print a summary at the end.
 
@@ -27,16 +27,16 @@ First you need to install `eofs` into your current Python environment::
     cd eofs/
     python setup.py install
 
-Then create a directory somewhere else without any Python code in it and run ``nosetests`` from there giving the package name ``eofs`` as a positional argument::
+Then create a directory somewhere else without any Python code in it and run ``pytest`` from there::
 
     mkdir $HOME/eofs-test-dir && cd $HOME/eofs-test-dir
-    nosetests -sv eofs
+    pytest --pyargs eofs
 
 This will run the tests on the version of `eofs` you just installed.
 
-.. _nose: https://nose.readthedocs.org/en/latest/
+.. _pytest: https://docs.pytest.org/en/latest/
 
-.. _pep8: https://pypi.python.org/pypi/pep8
+.. _pycodestyle: https://pypi.python.org/pypi/pycodestyle
 
 .. _UV-CDAT: http://uv-cdat.llnl.gov
 

doc/downloads.rst

@@ -8,6 +8,7 @@ Source code downloads for released versions, see the :doc:`changelog` for detail
 ===============================================================  ====================  ================
 Filename                                                         Summary               Released
 ===============================================================  ====================  ================
+:download:`eofs-1.3.0.tar.gz </distribution/eofs-1.3.0.tar.gz>`  version 1.3.0 source  12 Oct 2017
 :download:`eofs-1.2.0.tar.gz </distribution/eofs-1.2.0.tar.gz>`  version 1.2.0 source  25 Oct 2016
 :download:`eofs-1.1.0.tar.gz </distribution/eofs-1.1.0.tar.gz>`  version 1.1.0 source  3 Mar 2016
 :download:`eofs-1.0.0.tar.gz </distribution/eofs-1.0.0.tar.gz>`  version 1.0.0 source  16 Feb 2016