Skip to content

Commit 490e33a

Browse files
committed
Prep for RC1 release
1 parent d62c008 commit 490e33a

19 files changed

+55
-28
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
S3netCDF-python
22
---------------
33

4+
Changes between v2.0.12 and v2.1-rc1
5+
------------------------------------
6+
1. Tidied LICENSE information
7+
8+
Changes between v2.0.8 and v2.0.12
9+
----------------------------------
10+
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.
11+
2. Bugfixes to the splitter.
12+
413
Changes between v2.0.6 and v2.0.8
514
---------------------------------
615
1. Bug fix for indexing.

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BSD 2-Clause License
22

3-
Copyright (c) 2020, Centre of Environmental Data Analysis Developers,
3+
Copyright (c) 2019-2021, Centre of Environmental Data Analysis Developers,
44
Scientific and Technical Facilities Council (STFC),
55
UK Research and Innovation (UKRI).
66
All rights reserved.

S3netCDF4/Backends/_s3FileObject.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!python
22
#cython: language_level=3
33

4-
__copyright__ = "(C) 2020 Science and Technology Facilities Council"
4+
__copyright__ = "(C) 2019-2021 Science and Technology Facilities Council"
55
__license__ = "BSD - see LICENSE file in top-level directory"
66
__authors__ = "Neil Massey"
77

S3netCDF4/Backends/_s3aioFileObject.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!python
22
#cython: language_level=3
33

4-
__copyright__ = "(C) 2020 Science and Technology Facilities Council"
4+
__copyright__ = "(C) 2019-2021 Science and Technology Facilities Council"
55
__license__ = "BSD - see LICENSE file in top-level directory"
66
__authors__ = "Neil Massey"
77

S3netCDF4/CFA/_CFAClasses.pyx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!python
22
#cython: language_level=3
33

4-
__copyright__ = "(C) 2020 Science and Technology Facilities Council"
4+
__copyright__ = "(C) 2019-2021 Science and Technology Facilities Council"
55
__license__ = "BSD - see LICENSE file in top-level directory"
66
__authors__ = "Neil Massey"
77

@@ -248,9 +248,9 @@ cdef class CFAGroup:
248248
| CFAGroup |
249249
+----------------------------------------------------------------------+
250250
| CFADataset dataset |
251-
| cfa_dims dict<CFADim> |
252251
| grp_name string |
253252
| metadata dict<mixed> |
253+
| cfa_dims dict<CFADimension> |
254254
| cfa_vars dict<CFAVariable> |
255255
+----------------------------------------------------------------------+
256256
| CFAVariable createVariable(string var_name, |
@@ -641,7 +641,7 @@ cdef class CFAVariable:
641641
| pmshape array<int> |
642642
| base string |
643643
| nc_partition_group object |
644-
| subarry_shape np.ndarray |
644+
| subarray_shape np.ndarray |
645645
+----------------------------------------------------------------------+
646646
| string getName() |
647647
| CFAGroup getGroup() |
@@ -1222,8 +1222,8 @@ cdef class CFAVariable:
12221222
self.metadata[md_key] = cfa_metadata[md_key]
12231223

12241224
cpdef dict dump(CFAVariable self):
1225-
"""Return the a dictionary representation of the CFAVariable so it can be
1226-
added to the metadata for the variable later.
1225+
"""Return the a dictionary representation of the CFAVariable so it can
1226+
be added to the metadata for the variable later.
12271227
Returns:
12281228
dict: the JSON representation of the CFAVariable
12291229
"""

S3netCDF4/CFA/_CFAExceptions.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!python
22
#cython: language_level=3
33

4-
__copyright__ = "(C) 2020 Science and Technology Facilities Council"
4+
__copyright__ = "(C) 2019-2021 Science and Technology Facilities Council"
55
__license__ = "BSD - see LICENSE file in top-level directory"
66
__authors__ = "Neil Massey"
77

S3netCDF4/CFA/_CFASplitter.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!python
22
#cython: language_level=3
33

4-
__copyright__ = "(C) 2020 Science and Technology Facilities Council"
4+
__copyright__ = "(C) 2019-2021 Science and Technology Facilities Council"
55
__license__ = "BSD - see LICENSE file in top-level directory"
66
__authors__ = "Neil Massey"
77

S3netCDF4/Managers/_ConfigManager.pyx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#!python
22
#cython: language_level=3
33

4+
__copyright__ = "(C) 2019-2021 Science and Technology Facilities Council"
5+
__license__ = "BSD - see LICENSE file in top-level directory"
6+
__authors__ = "Neil Massey"
7+
48
"""
59
Configuration management for S3netCDF. Configuration is stored for each user
610
in a JSON file in their home directory: ~/.s3nc.json
711
"""
812

9-
__copyright__ = "(C) 2020 Science and Technology Facilities Council"
10-
__license__ = "BSD - see LICENSE file in top-level directory"
11-
__authors__ = "Neil Massey"
12-
1313
import os
1414
import json
1515
import psutil

S3netCDF4/Managers/_ConnectionPool.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!python
22
#cython: language_level=3
33

4-
__copyright__ = "(C) 2020 Science and Technology Facilities Council"
4+
__copyright__ = "(C) 2019-2021 Science and Technology Facilities Council"
55
__license__ = "BSD - see LICENSE file in top-level directory"
66
__authors__ = "Neil Massey"
77

S3netCDF4/Managers/_FileManager.pyx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!python
22
#cython: language_level=3
33

4-
__copyright__ = "(C) 2020 Science and Technology Facilities Council"
4+
__copyright__ = "(C) 2019-2021 Science and Technology Facilities Council"
55
__license__ = "BSD - see LICENSE file in top-level directory"
66
__authors__ = "Neil Massey"
77

@@ -15,9 +15,6 @@ o. Reading / writing to a file can then be performed by operations on the file
1515
object.
1616
"""
1717

18-
__copyright__ = "(C) 2019 Science and Technology Facilities Council"
19-
__license__ = "BSD - see LICENSE file in top-level directory"
20-
2118
import asyncio
2219
import inspect
2320
import time

0 commit comments

Comments
 (0)