Prep for RC1 release

nmassey001 · nmassey001 · commit 490e33a6c084 · 2021-03-03T11:48:34.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,15 @@
 S3netCDF-python
 ---------------
 
+Changes between v2.0.12 and v2.1-rc1
+------------------------------------
+1. Tidied LICENSE information
+
+Changes between v2.0.8 and v2.0.12
+----------------------------------
+1. Added a s3_nc_cfa_split.py program to split a large netCDF file into smaller netCDF subarray files and produce a CFA-netCDF master array file.
+2. Bugfixes to the splitter.
+
 Changes between v2.0.6 and v2.0.8
 ---------------------------------
 1. Bug fix for indexing.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 BSD 2-Clause License
 
-Copyright (c) 2020, Centre of Environmental Data Analysis Developers,
+Copyright (c) 2019-2021, Centre of Environmental Data Analysis Developers,
 Scientific and Technical Facilities Council (STFC),
 UK Research and Innovation (UKRI).
 All rights reserved.
diff --git a/S3netCDF4/Backends/_s3FileObject.pyx b/S3netCDF4/Backends/_s3FileObject.pyx
@@ -1,7 +1,7 @@
 #!python
 #cython: language_level=3
 
-__copyright__ = "(C) 2020 Science and Technology Facilities Council"
+__copyright__ = "(C) 2019-2021 Science and Technology Facilities Council"
 __license__ = "BSD - see LICENSE file in top-level directory"
 __authors__ = "Neil Massey"
 
diff --git a/S3netCDF4/Backends/_s3aioFileObject.pyx b/S3netCDF4/Backends/_s3aioFileObject.pyx
@@ -1,7 +1,7 @@
 #!python
 #cython: language_level=3
 
-__copyright__ = "(C) 2020 Science and Technology Facilities Council"
+__copyright__ = "(C) 2019-2021 Science and Technology Facilities Council"
 __license__ = "BSD - see LICENSE file in top-level directory"
 __authors__ = "Neil Massey"
 
diff --git a/S3netCDF4/CFA/_CFAClasses.pyx b/S3netCDF4/CFA/_CFAClasses.pyx
@@ -1,7 +1,7 @@
 #!python
 #cython: language_level=3
 
-__copyright__ = "(C) 2020 Science and Technology Facilities Council"
+__copyright__ = "(C) 2019-2021 Science and Technology Facilities Council"
 __license__ = "BSD - see LICENSE file in top-level directory"
 __authors__ = "Neil Massey"
 
@@ -248,9 +248,9 @@ cdef class CFAGroup:
         | CFAGroup                                                             |
         +----------------------------------------------------------------------+
         | CFADataset      dataset                                              |
-        | cfa_dims        dict<CFADim>                                         |
         | grp_name        string                                               |
         | metadata        dict<mixed>                                          |
+        | cfa_dims        dict<CFADimension>                                   |
         | cfa_vars        dict<CFAVariable>                                    |
         +----------------------------------------------------------------------+
         | CFAVariable         createVariable(string var_name,                  |
@@ -641,7 +641,7 @@ cdef class CFAVariable:
         | pmshape             array<int>                                       |
         | base                string                                           |
         | nc_partition_group  object                                           |
-        | subarry_shape       np.ndarray                                       |
+        | subarray_shape      np.ndarray                                       |
         +----------------------------------------------------------------------+
         | string              getName()                                        |
         | CFAGroup            getGroup()                                       |
@@ -1222,8 +1222,8 @@ cdef class CFAVariable:
                 self.metadata[md_key] = cfa_metadata[md_key]
 
     cpdef dict dump(CFAVariable self):
-        """Return the a dictionary representation of the CFAVariable so it can be
-           added to the metadata for the variable later.
+        """Return the a dictionary representation of the CFAVariable so it can
+           be added to the metadata for the variable later.
            Returns:
                dict: the JSON representation of the CFAVariable
         """
diff --git a/S3netCDF4/CFA/_CFAExceptions.pyx b/S3netCDF4/CFA/_CFAExceptions.pyx
@@ -1,7 +1,7 @@
 #!python
 #cython: language_level=3
 
-__copyright__ = "(C) 2020 Science and Technology Facilities Council"
+__copyright__ = "(C) 2019-2021 Science and Technology Facilities Council"
 __license__ = "BSD - see LICENSE file in top-level directory"
 __authors__ = "Neil Massey"
 
diff --git a/S3netCDF4/CFA/_CFASplitter.pyx b/S3netCDF4/CFA/_CFASplitter.pyx
@@ -1,7 +1,7 @@
 #!python
 #cython: language_level=3
 
-__copyright__ = "(C) 2020 Science and Technology Facilities Council"
+__copyright__ = "(C) 2019-2021 Science and Technology Facilities Council"
 __license__ = "BSD - see LICENSE file in top-level directory"
 __authors__ = "Neil Massey"
 
diff --git a/S3netCDF4/Managers/_ConfigManager.pyx b/S3netCDF4/Managers/_ConfigManager.pyx
@@ -1,15 +1,15 @@
 #!python
 #cython: language_level=3
 
+__copyright__ = "(C) 2019-2021 Science and Technology Facilities Council"
+__license__ = "BSD - see LICENSE file in top-level directory"
+__authors__ = "Neil Massey"
+
 """
 Configuration management for S3netCDF.  Configuration is stored for each user
 in a JSON file in their home directory: ~/.s3nc.json
 """
 
-__copyright__ = "(C) 2020 Science and Technology Facilities Council"
-__license__ = "BSD - see LICENSE file in top-level directory"
-__authors__ = "Neil Massey"
-
 import os
 import json
 import psutil
diff --git a/S3netCDF4/Managers/_ConnectionPool.pyx b/S3netCDF4/Managers/_ConnectionPool.pyx
@@ -1,7 +1,7 @@
 #!python
 #cython: language_level=3
 
-__copyright__ = "(C) 2020 Science and Technology Facilities Council"
+__copyright__ = "(C) 2019-2021 Science and Technology Facilities Council"
 __license__ = "BSD - see LICENSE file in top-level directory"
 __authors__ = "Neil Massey"
 
diff --git a/S3netCDF4/Managers/_FileManager.pyx b/S3netCDF4/Managers/_FileManager.pyx
@@ -1,7 +1,7 @@
 #!python
 #cython: language_level=3
 
-__copyright__ = "(C) 2020 Science and Technology Facilities Council"
+__copyright__ = "(C) 2019-2021 Science and Technology Facilities Council"
 __license__ = "BSD - see LICENSE file in top-level directory"
 __authors__ = "Neil Massey"
 
@@ -15,9 +15,6 @@ o. Reading / writing to a file can then be performed by operations on the file
    object.
 """
 
-__copyright__ = "(C) 2019 Science and Technology Facilities Council"
-__license__ = "BSD - see LICENSE file in top-level directory"
-
 import asyncio
 import inspect
 import time
diff --git a/S3netCDF4/_Exceptions.pyx b/S3netCDF4/_Exceptions.pyx
@@ -1,7 +1,7 @@
 #!python
 #cython: language_level=3
 
-__copyright__ = "(C) 2020 Science and Technology Facilities Council"
+__copyright__ = "(C) 2019-2021 Science and Technology Facilities Council"
 __license__ = "BSD - see LICENSE file in top-level directory"
 __authors__ = "Neil Massey"
 
diff --git a/S3netCDF4/_s3netCDF4.pyx b/S3netCDF4/_s3netCDF4.pyx
@@ -1,7 +1,7 @@
 #!python
 #cython: language_level=3
 
-__copyright__ = "(C) 2020 Science and Technology Facilities Council"
+__copyright__ = "(C) 2019-2021 Science and Technology Facilities Council"
 __license__ = "BSD - see LICENSE file in top-level directory"
 __authors__ = "Neil Massey"
 
diff --git a/bin/s3nc_cfa_agg.py b/bin/s3nc_cfa_agg.py
@@ -1,5 +1,9 @@
 #! /usr/bin/env python
 
+__copyright__ = "(C) 2019-2021 Science and Technology Facilities Council"
+__license__ = "BSD - see LICENSE file in top-level directory"
+__authors__ = "Neil Massey"
+
 """Program to aggregate netCDF-CFA files from disk or s3.
 This program will produce a master array file, containing references to the
 files that have been aggregated.
diff --git a/bin/s3nc_cfa_info.py b/bin/s3nc_cfa_info.py
@@ -1,5 +1,9 @@
 #! /usr/bin/env python
 
+__copyright__ = "(C) 2019-2021 Science and Technology Facilities Council"
+__license__ = "BSD - see LICENSE file in top-level directory"
+__authors__ = "Neil Massey"
+
 """Program to return information about a netCDF-CFA file from disk or S3.
 Modelled after ncdump and cdo info.
 """
diff --git a/bin/s3nc_cfa_split.py b/bin/s3nc_cfa_split.py
@@ -1,5 +1,9 @@
 #! /usr/bin/env python
 
+__copyright__ = "(C) 2019-2021 Science and Technology Facilities Council"
+__license__ = "BSD - see LICENSE file in top-level directory"
+__authors__ = "Neil Massey"
+
 """Program to split a netCDF file into a netCDF-CFA master file and a number
 of netCDF sub array files.
 """
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,3 +1,4 @@
 [build-system]
 # Minimum requirements for the build system to execute.
 requires = ["setuptools", "wheel", "Cython", "numpy"] # PEP 508 specifications.
+build-backend = "setuptools.build_meta"
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,6 @@
-numpy==1.18.1
-Cython==0.29.15
-netCDF4==1.5.3
-botocore==1.15.15
-aiobotocore==0.12.0
-psutil==5.7.0
+numpy==1.19.4
+Cython==0.29.21
+netCDF4==1.5.5.1
+botocore==1.19.20
+aiobotocore==1.1.2
+psutil==5.7.3
diff --git a/setup.py b/setup.py
@@ -1,3 +1,7 @@
+__copyright__ = "(C) 2019-2021 Science and Technology Facilities Council"
+__license__ = "BSD - see LICENSE file in top-level directory"
+__authors__ = "Neil Massey"
+
 import os
 from setuptools import Extension, setup
 from Cython.Build import cythonize
@@ -104,7 +108,7 @@
 
 setup(
     name='S3netCDF4',
-    version='2.0.11',
+    version='2.1-rc1',
     packages=['S3netCDF4'],
     install_requires=[
       'numpy>=1.19.0',
diff --git a/tutorial/lesson_1.py b/tutorial/lesson_1.py
@@ -1,3 +1,7 @@
+__copyright__ = "(C) 2019-2021 Science and Technology Facilities Council"
+__license__ = "BSD - see LICENSE file in top-level directory"
+__authors__ = "Neil Massey"
+
 # s3-netCDF-python Tutorial 1
 # Purpose: Read a time series from a CMIP6 dataset
 # Author : Neil Massey
