Skip to content

Commit 837d110

Browse files
kwmsmithkwmsmith
committed
Merge pull request #103 from enthought/feature/bump-version
Change version number to 0.10.0
2 parents 875f77e + ba616f5 commit 837d110

File tree

5 files changed

+37
-36
lines changed

5 files changed

+37
-36
lines changed

‎all_examples.rst‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ In process 0:
1919
>>> distbuffer.keys()
2020
['__version__', 'buffer', 'dim_data']
2121
>>> distbuffer['__version__']
22-
'0.9.0'
22+
'0.10.0'
2323
>>> distbuffer['buffer']
2424
array([ 0.2, 0.6, 0.9, 0.6, 0.8, 0.4, 0.2, 0.2, 0.3, 0.5])
2525
>>> distbuffer['dim_data']
@@ -44,7 +44,7 @@ In process 1:
4444
>>> distbuffer.keys()
4545
['__version__', 'buffer', 'dim_data']
4646
>>> distbuffer['__version__']
47-
'0.9.0'
47+
'0.10.0'
4848
>>> distbuffer['buffer']
4949
array([ 0.9, 0.2, 1. , 0.4, 0.5, 0. , 0.6, 0.8, 0.6, 1. ])
5050
>>> distbuffer['dim_data']
@@ -101,7 +101,7 @@ In process 0:
101101
>>> distbuffer.keys()
102102
['__version__', 'buffer', 'dim_data']
103103
>>> distbuffer['__version__']
104-
'0.9.0'
104+
'0.10.0'
105105
>>> distbuffer['buffer']
106106
array([ 0.2, 0.6, 0.9, 0.6, 0.8, 0.4, 0.2, 0.2, 0.3, 0.9])
107107
>>> distbuffer['dim_data']
@@ -121,7 +121,7 @@ In process 1:
121121
>>> distbuffer.keys()
122122
['__version__', 'buffer', 'dim_data']
123123
>>> distbuffer['__version__']
124-
'0.9.0'
124+
'0.10.0'
125125
>>> distbuffer['buffer']
126126
array([ 0.3, 0.9, 0.2, 1. , 0.4, 0.5, 0. , 0.6, 0.8, 0.6])
127127
>>> distbuffer['dim_data']
@@ -149,7 +149,7 @@ On all processes:
149149
>>> distbuffer.keys()
150150
['__version__', 'buffer', 'dim_data']
151151
>>> distbuffer['__version__']
152-
'0.9.0'
152+
'0.10.0'
153153
>>> len(distbuffer['dim_data']) == 1 # one dimension only
154154
True
155155

‎conf.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
# built documents.
5252
#
5353
# The short X.Y version.
54-
version = '0.9.0'
54+
version = '0.10.0'
5555
# The full version, including alpha/beta/rc tags.
56-
release = '0.9.0'
56+
release = '0.10.0'
5757

5858
# The language for content autogenerated by Sphinx. Refer to documentation
5959
# for a list of supported languages.

‎index.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
================================
2-
Distributed Array Protocol 0.9.0
3-
================================
1+
====================================
2+
Distributed Array Protocol |version|
3+
====================================
44

55
.. toctree::
66
:numbered:

‎tests/test_validator.py‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
import validator
55

66

7+
VERSION = '0.10.0'
8+
9+
710
class TestValidDimData(unittest.TestCase):
811

912
def test_block(self):
@@ -13,7 +16,7 @@ def test_block(self):
1316
'proc_grid_rank': 0,
1417
'start': 0,
1518
'stop': 10},)
16-
distbuffer = {'__version__': '1.0.0',
19+
distbuffer = {'__version__': VERSION,
1720
'buffer': np.ones(10),
1821
'dim_data': dim_data}
1922

@@ -26,7 +29,7 @@ def test_cyclic(self):
2629
'proc_grid_size': 2,
2730
'proc_grid_rank': 0,
2831
'start': 0},)
29-
distbuffer = {'__version__': '1.0.0',
32+
distbuffer = {'__version__': VERSION,
3033
'buffer': np.ones(50),
3134
'dim_data': dim_data}
3235

@@ -40,7 +43,7 @@ def test_block_cyclic(self):
4043
'proc_grid_rank': 1,
4144
'start': 5,
4245
'block_size': 5},)
43-
distbuffer = {'__version__': '1.0.0',
46+
distbuffer = {'__version__': VERSION,
4447
'buffer': np.ones(50),
4548
'dim_data': dim_data}
4649

@@ -54,7 +57,7 @@ def test_unstructured(self):
5457
'proc_grid_rank': 1,
5558
'indices': np.array([1, 22, 44, 49, 9, 33, 21], dtype=np.uint32)
5659
},)
57-
distbuffer = {'__version__': '1.0.0',
60+
distbuffer = {'__version__': VERSION,
5861
'buffer': np.ones(len(dim_data[0]['indices'])),
5962
'dim_data': dim_data}
6063

@@ -69,7 +72,7 @@ def test_extra_process(self):
6972
'proc_grid_rank':0,
7073
'start' : 0,
7174
}
72-
distbuffer = {'__version__': '1.0.0',
75+
distbuffer = {'__version__': VERSION,
7376
'buffer' : b'a',
7477
'dim_data' : (dimdata,)}
7578
is_valid, msg = validator.validate(distbuffer)
@@ -83,15 +86,15 @@ def test_empty_process(self):
8386
'proc_grid_rank':3,
8487
'start' : 3,
8588
}
86-
distbuffer = {'__version__': '1.0.0',
89+
distbuffer = {'__version__': VERSION,
8790
'buffer' : b'',
8891
'dim_data' : (dimdata,)}
8992
is_valid, msg = validator.validate(distbuffer)
9093
self.assertTrue(is_valid, msg)
9194

9295
def test_empty_dict_alias(self):
9396
dimdata = {}
94-
distbuffer = {'__version__': '1.0.0',
97+
distbuffer = {'__version__': VERSION,
9598
'buffer' : b'',
9699
'dim_data' : (dimdata,)}
97100
is_valid, msg = validator.validate(distbuffer)
@@ -108,7 +111,7 @@ def test_missing_buffer(self):
108111
'proc_grid_rank':3,
109112
'start' : 3,
110113
}
111-
distbuffer = {'__version__': '1.0.0',
114+
distbuffer = {'__version__': VERSION,
112115
'dim_data' : (dimdata,)}
113116
is_valid, msg = validator.validate(distbuffer)
114117
self.assertTrue(not is_valid, msg)
@@ -127,7 +130,7 @@ def test_missing_version(self):
127130
self.assertTrue(not is_valid, msg)
128131

129132
def test_missing_dim_data(self):
130-
distbuffer = {'__version__': '1.0.0',
133+
distbuffer = {'__version__': VERSION,
131134
'buffer' : b'',}
132135
is_valid, msg = validator.validate(distbuffer)
133136
self.assertTrue(not is_valid, msg)
@@ -143,7 +146,7 @@ def test_bad_buffer(self):
143146
'proc_grid_rank':3,
144147
'start' : 3,
145148
}
146-
distbuffer = {'__version__': '1.0.0',
149+
distbuffer = {'__version__': VERSION,
147150
'dim_data' : (dimdata,),
148151
'buffer' : [1,2,3,4],}
149152
is_valid, msg = validator.validate(distbuffer)
@@ -174,7 +177,7 @@ def test_bad_dist_type(self):
174177
'proc_grid_rank': 0,
175178
'start': 0,
176179
'stop': 51},)
177-
distbuffer = {'__version__': '1.0.0',
180+
distbuffer = {'__version__': VERSION,
178181
'buffer': np.ones(51),
179182
'dim_data': dim_data}
180183

@@ -189,7 +192,7 @@ def test_bad_block_stop_0(self):
189192
'proc_grid_rank': 0,
190193
'start': 0,
191194
'stop': 51},)
192-
distbuffer = {'__version__': '1.0.0',
195+
distbuffer = {'__version__': VERSION,
193196
'buffer': np.ones(51),
194197
'dim_data': dim_data}
195198

@@ -204,7 +207,7 @@ def test_bad_block_stop_1(self):
204207
'proc_grid_rank': 0,
205208
'start': 10,
206209
'stop': 9},)
207-
distbuffer = {'__version__': '1.0.0',
210+
distbuffer = {'__version__': VERSION,
208211
'buffer': np.ones((0,)),
209212
'dim_data': dim_data}
210213

@@ -219,7 +222,7 @@ def test_bad_block_start(self):
219222
'proc_grid_rank': 0,
220223
'start': -1,
221224
'stop': 10},)
222-
distbuffer = {'__version__': '1.0.0',
225+
distbuffer = {'__version__': VERSION,
223226
'buffer': np.ones(11),
224227
'dim_data': dim_data}
225228

@@ -235,7 +238,7 @@ def test_bad_block_padding(self):
235238
'start': 0,
236239
'stop': 10,
237240
'padding': ('a','b')},)
238-
distbuffer = {'__version__': '1.0.0',
241+
distbuffer = {'__version__': VERSION,
239242
'buffer': np.ones(10),
240243
'dim_data': dim_data}
241244

@@ -250,7 +253,7 @@ def test_bad_cyclic_block_size(self):
250253
'proc_grid_rank': 0,
251254
'start': 0,
252255
'block_size': -10},)
253-
distbuffer = {'__version__': '1.0.0',
256+
distbuffer = {'__version__': VERSION,
254257
'buffer': np.ones(10),
255258
'dim_data': dim_data}
256259

@@ -264,7 +267,7 @@ def test_bad_unstructured_indices(self):
264267
'proc_grid_size': 2,
265268
'proc_grid_rank': 0,
266269
'indices': [1, 2, 3, 4]},)
267-
distbuffer = {'__version__': '1.0.0',
270+
distbuffer = {'__version__': VERSION,
268271
'buffer': np.ones(4),
269272
'dim_data': dim_data}
270273

@@ -283,7 +286,7 @@ def test_undistributed_padded_periodic(self):
283286
'stop': 10,
284287
'padding': (2,2),
285288
'periodic': True,},)
286-
distbuffer = {'__version__': '1.0.0',
289+
distbuffer = {'__version__': VERSION,
287290
'buffer': np.ones(10),
288291
'dim_data': dim_data}
289292

‎validator.py‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"""
2-
Functions to validate Distributed Array Protocol data structures.
2+
Functions to validate Distributed Array Protocol data structures for protocol
3+
version 0.10.0.
34
45
Functions
56
---------
@@ -12,6 +13,9 @@
1213
from distutils.version import StrictVersion
1314

1415

16+
VERSIONS = ((0, 10, 0),)
17+
18+
1519
def _verify_exact_keys(dd, keys):
1620
dkeys = set(dd)
1721
keys = set(keys)
@@ -211,8 +215,6 @@ def validate_dim_dict(idx, dim_dict):
211215
Returns a 2-tuple of a boolean and string; boolean indicates validity, the
212216
string indicates the reason for invalidity, empty otherwise.
213217
214-
Currently supports Protocol versions 0.9.x and 1.0.x.
215-
216218
"""
217219
# Check for the empty dim_dict alias
218220
if not dim_dict: # the dim_dict is empty
@@ -238,8 +240,6 @@ def validate_dim_data(dim_data):
238240
Returns a 2-tuple of a boolean and string; boolean indicates validity, the
239241
string indicates the reason for invalidity, empty otherwise.
240242
241-
Currently supports Protocol versions 0.9.x and 1.0.x.
242-
243243
"""
244244
# First, check that it's a tuple...
245245
if not isinstance(dim_data, tuple):
@@ -268,8 +268,6 @@ def validate(distbuffer):
268268
Returns a 2-tuple of a boolean and string; boolean indicates validity, the
269269
string indicates the reason for invalidity, empty otherwise.
270270
271-
Currently supports Protocol versions 0.9.x and 1.0.x.
272-
273271
"""
274272
# Verify distbuffer is a dictionary.
275273
if not isinstance(distbuffer, dict):
@@ -295,7 +293,7 @@ def validate(distbuffer):
295293
return (False, msg % version)
296294

297295
# Verify the version number.
298-
if strict_version.version not in ((0,9,0), (1,0,0)):
296+
if strict_version.version not in VERSIONS:
299297
msg = '__version__ "%s" not supported by this checker.'
300298
return (False, msg % version)
301299

0 commit comments

Comments
 (0)