CLN: Code changes in preparation for 2.0 release

- Incremented version number
- Minor changes to CI scripts

.travis.yml

@@ -3,9 +3,12 @@ language: python
 sudo: false
 
 env:
-  - CONDA_PYTHON="python=2.7", NESII_CHANNEL="nesii/channel/dev-ocgis", OCGIS_DEPS_ADDS="icclim esmpy"
-  - CONDA_PYTHON="python=3.5", NESII_CHANNEL="nesii/channel/dev-ocgis", OCGIS_DEPS_ADDS=""
-  - CONDA_PYTHON="python=3.6", NESII_CHANNEL="nesii/channel/dev-ocgis", OCGIS_DEPS_ADDS=""
+  global:
+    - NESII_CHANNEL="nesii"
+  matrix:
+    - CONDA_PYTHON="python=2.7", OCGIS_DEPS_ADDS="icclim esmpy"
+    - CONDA_PYTHON="python=3.5", OCGIS_DEPS_ADDS=""
+    - CONDA_PYTHON="python=3.6", OCGIS_DEPS_ADDS=""
 
 before_install:
   - wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh;

Dockerfile

@@ -8,9 +8,9 @@ RUN apt-get clean
 
 RUN conda update -y --all
 
-RUN conda install -y -c nesii/channel/dev-ocgis -c conda-forge ocgis=2.0.0 esmpy=7.0.0 icclim=4.2.5 nose
+RUN conda install -y -c nesii -c conda-forge ocgis=2.0.0 esmpy=7.0.0 icclim=4.2.5 nose
 RUN conda remove -y ocgis
-RUN git clone -b v-2.0.0.dev1 --depth=1 https://github.com/NCPP/ocgis.git
+RUN git clone --depth=1 https://github.com/NCPP/ocgis.git
 RUN cd ocgis && python setup.py install
 
 ENV GDAL_DATA /opt/conda/share/gdal

doc/conf.py

@@ -51,9 +51,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.0.0.dev1'
+version = '2.0.0'
 # The full version, including alpha/beta/rc tags.
-release = '2.0.0.dev1'
+release = '2.0.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/install.rst

@@ -47,7 +47,7 @@ Building from Source
 
 1. Download the current release:
 
- * http://www.earthsystemmodeling.org/ocgis_releases/public/ocgis-1.3.1/reg/OCGIS_Framework_Reg.html
+ * http://www.earthsystemmodeling.org/ocgis_releases/public/ocgis-2.0.0/reg/OCGIS_Framework_Reg.html
 
 2. Extract the file using your favorite extraction utility.
 3. Navigate into extracted directory.

misc/environment-readthedocs.yml

@@ -1,7 +1,7 @@
 name: rtd
 
 channels:
-- nesii/channel/dev-ocgis
+- nesii
 - conda-forge
 
 dependencies:

misc/sh/test-core.sh

@@ -15,7 +15,7 @@ for jj in "${tests[@]}"; do
         echo "Running serial tests: ${jj}"
         echo -e "=====================\\n"
 
-        nosetests -x -a '!release' ${jj}
+        nosetests -vsx -a '!release' ${jj}
         if [ $? == 1 ]; then
             echo "FAIL: One or more serial tests failed."
             exit 1

setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, Command, find_packages
 from setuptools.command.test import test as TestCommand
 
-VERSION = '2.0.0.dev1'
+VERSION = '2.0.0'
 
 
 ########################################################################################################################

src/ocgis/__init__.py

@@ -22,5 +22,5 @@
 from ocgis.variable.temporal import TemporalVariable
 from ocgis.variable.geom import GeometryVariable
 
-__version__ = '2.0.0.dev1'
-__release__ = '2.0.0.dev1'
+__version__ = '2.0.0'
+__release__ = '2.0.0'

src/ocgis/spatial/grid.py

@@ -140,7 +140,6 @@ def __init__(self, x, y, z=None, abstraction='auto', crs=None, parent=None, mask
             if not isinstance(parent, Field):
                 raise ValueError("'parent' objects must be fields")
 
-
         self._abstraction = None
 
         self.abstraction = abstraction

src/ocgis/test/base.py

@@ -22,7 +22,7 @@
 
 from ocgis import RequestDataset
 from ocgis import SourcedVariable
-from ocgis import Variable, Dimension, VariableCollection
+from ocgis import Variable, Dimension
 from ocgis import env
 from ocgis.collection.field import Field
 from ocgis.spatial.geom_cabinet import GeomCabinet

src/ocgis/test/test_ocgis/test_collection/test_spatial.py

@@ -69,7 +69,8 @@ def get_subset_field(self):
 
         gridcode = Variable('gridcode', [110101, 12103], dimensions='ngeom')
         description = Variable('description', ['high point', 'low point'], dimensions='ngeom')
-        dimension_map = {'geom': {'variable': 'geoms', DimensionMapKey.DIMENSION: ['ngeom']}, 'crs': {'variable': crs.name}}
+        dimension_map = {'geom': {'variable': 'geoms', DimensionMapKey.DIMENSION: ['ngeom']},
+                         'crs': {'variable': crs.name}}
         poi = Field(variables=[geoms, gridcode, description], dimension_map=dimension_map,
                     is_data=[gridcode, description])
         geoms.set_ugid(gridcode)

src/ocgis/test/test_ocgis/test_conv/test_meta.py

@@ -53,7 +53,6 @@ def test_write(self):
         self.assertIsInstance(ret, six.string_types)
 
 
-
 class TestMetaOCGISConverter(TestBase):
     @attr('data')
     def test_init(self):

src/ocgis/test/test_ocgis/test_ops/test_core.py

@@ -2,11 +2,11 @@
 import datetime
 import itertools
 import os
+import sys
 from datetime import datetime as dt
 from unittest import SkipTest
 
 import numpy as np
-import sys
 from shapely.geometry import Point, LineString
 
 import ocgis
@@ -29,7 +29,7 @@
 from ocgis.variable.crs import Spherical, CoordinateReferenceSystem, WGS84
 from ocgis.variable.temporal import TemporalVariable
 from ocgis.vmachine.mpi import OcgDist, MPI_RANK, variable_collection_scatter, MPI_COMM, dgather, \
-    hgather, MPI_SIZE, barrier_print, rank_print
+    hgather, MPI_SIZE
 
 
 class TestOcgOperations(TestBase):

src/ocgis/test/test_ocgis/test_spatial/test_grid.py

@@ -1,10 +1,10 @@
 import itertools
+import sys
 from copy import deepcopy
 from unittest import SkipTest
 
 import fiona
 import numpy as np
-import sys
 from numpy.testing.utils import assert_equal
 from shapely import wkt
 from shapely.geometry import Point, box, MultiPolygon, shape
@@ -20,7 +20,7 @@
 from ocgis.spatial.grid import Grid, expand_grid, GridGeometryProcessor
 from ocgis.test.base import attr, AbstractTestInterface, create_gridxy_global
 from ocgis.util.helpers import make_poly, iter_array
-from ocgis.variable.base import Variable, VariableCollection, SourcedVariable
+from ocgis.variable.base import Variable, SourcedVariable
 from ocgis.variable.crs import WGS84, CoordinateReferenceSystem, Spherical, Cartesian
 from ocgis.variable.dimension import Dimension
 from ocgis.variable.geom import GeometryVariable

src/ocgis/test/test_ocgis/test_util/test_large_array.py

@@ -1,7 +1,6 @@
 import time
 from copy import deepcopy
 
-import netCDF4 as nc
 import numpy as np
 
 import ocgis

src/ocgis/test/test_ocgis/test_variable/test_crs.py

@@ -1,7 +1,7 @@
 import os
+import sys
 from copy import deepcopy
 from unittest import SkipTest
-import sys
 
 import netCDF4 as nc
 import numpy as np
@@ -21,7 +21,7 @@
 from ocgis.variable.base import Variable
 from ocgis.variable.crs import CoordinateReferenceSystem, CFAlbersEqualArea, CFLambertConformal, \
     CFRotatedPole, WGS84, Spherical, CFSpherical, Tripole, Cartesian
-from ocgis.vmachine.mpi import OcgDist, MPI_RANK, variable_scatter, MPI_COMM
+from ocgis.vmachine.mpi import OcgDist, MPI_RANK, variable_scatter
 
 
 class TestCoordinateReferenceSystem(TestBase):

src/ocgis/util/logging_ocgis.py

@@ -1,17 +1,16 @@
 import datetime
 import logging
 import os
+import sys
 from warnings import warn
 
 import six
-import sys
 
 import ocgis
 from ocgis import env
 from ocgis.exc import OcgWarning
 from ocgis.vmachine.mpi import get_standard_comm_state
 
-
 fiona_logger = logging.getLogger('Fiona')
 fiona_logger.setLevel(logging.ERROR)