Skip to content

Commit 2536c9a

Browse files
rweigelrweigel
committed
Increment version to 0.1.9b2
1 parent f0f34f4 commit 2536c9a

File tree

8 files changed

+110
-108
lines changed

8 files changed

+110
-108
lines changed

‎CHANGES.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,5 @@ v0.1.9b1:
7272
2020-01-19 -- Deleted v0.1.8 pip package b/c affected by above
7373
2020-01-20 -- 9f8b82f Use atol instead of rtol in readcompare.py
7474
2020-01-20 -- d3625e3 Fix for wrong error message (#24)
75+
v0.1.9b2:
76+

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ PYTHONVERS=python3.8 python3.7 python3.6 python3.5 python2.7
4848

4949
# VERSION is updated in "make version-update" step and derived
5050
# from CHANGES.txt. Do not edit.
51-
VERSION=0.1.9b1
51+
VERSION=0.1.9b2
5252
SHELL:= /bin/bash
5353

5454
LONG_TESTS=false

‎hapiclient/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
# Allow "from hapiclient import HAPIError"
88
from hapiclient.util import HAPIError
99

10-
__version__ = '0.1.9b1'
10+
__version__ = '0.1.9b2'

‎hapiclient/hapi.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ def hapiopts():
144144
def hapi(*args, **kwargs):
145145
"""Request data from a HAPI server.
146146
147-
Version: 0.1.9b1
147+
Version: 0.1.9b2
148148
149149
150150
Examples

‎hapiclient/test/readcompare.log‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,58 +3,58 @@ Parameter(s) = scalar; run = short. cache = False; usecache = False
33
___________________________________________________________
44
Method total d/l->buff parse buff
55
___________________________________________________________
6-
csv; numpy; no len. 0.2068 0.1556 0.0013
7-
csv; pandas; no len. 0.2195 0.1801 0.0036 (diffs in float values <= 1e-15)
8-
csv; numpy 0.2339 0.1799 0.0003 (diffs in float values <= 1e-15)
9-
csv; pandas 0.2396 0.1838 0.0025 (diffs in float values <= 1e-15)
10-
binary 0.2475 0.1748 0.0000 (diffs in float values <= 1e-15)
6+
csv; numpy; no len. 0.2259 0.2012 0.0010
7+
csv; pandas; no len. 0.2217 0.1939 0.0035
8+
csv; numpy 0.2685 0.2422 0.0003
9+
csv; pandas 0.2267 0.1982 0.0027
10+
binary 0.2076 0.1638 0.0000
1111

1212
Parameter(s) = scalar,vector; run = short. cache = False; usecache = False
1313
___________________________________________________________
1414
Method total d/l->buff parse buff
1515
___________________________________________________________
16-
csv; numpy; no len. 0.2308 0.1813 0.0005
17-
csv; pandas; no len. 0.2422 0.1865 0.0031
18-
csv; numpy 0.2325 0.1823 0.0003
19-
csv; pandas 0.2432 0.1854 0.0029
20-
binary 0.2544 0.1697 0.0000
16+
csv; numpy; no len. 0.2212 0.1981 0.0007
17+
csv; pandas; no len. 0.2278 0.1954 0.0030
18+
csv; numpy 0.2183 0.1943 0.0003
19+
csv; pandas 0.2165 0.1866 0.0042
20+
binary 0.1999 0.1579 0.0000
2121

2222
Parameter(s) = ; run = short. cache = False; usecache = False
2323
___________________________________________________________
2424
Method total d/l->buff parse buff
2525
___________________________________________________________
26-
csv; numpy; no len. 0.2327 0.1779 0.0069
27-
csv; pandas; no len. 0.2543 0.1821 0.0196
28-
csv; numpy 0.2249 0.1796 0.0042
29-
csv; pandas 0.2507 0.1816 0.0189
30-
binary 0.2379 0.1785 0.0000
26+
csv; numpy; no len. 0.2150 0.1836 0.0072
27+
csv; pandas; no len. 0.2349 0.1830 0.0196
28+
csv; numpy 0.2110 0.1855 0.0034
29+
csv; pandas 0.2397 0.1945 0.0201
30+
binary 0.2190 0.1749 0.0000
3131

3232
Parameter(s) = scalar; run = short. cache = True; usecache = False
3333
_____________________________________________________________
3434
Method total d/l->file read & parse file
3535
_____________________________________________________________
36-
csv; numpy; no len. 0.2177 0.1751 0.0013
37-
csv; pandas; no len. 0.2107 0.1516 0.0028 (diffs in float values <= 1e-15)
38-
csv; numpy 0.2065 0.1760 0.0005 (diffs in float values <= 1e-15)
39-
csv; pandas 0.2110 0.1504 0.0035 (diffs in float values <= 1e-15)
40-
binary 0.2740 0.1852 0.0001 (diffs in float values <= 1e-15)
36+
csv; numpy; no len. 0.2306 0.2008 0.0014
37+
csv; pandas; no len. 0.2252 0.1952 0.0028
38+
csv; numpy 0.2257 0.1956 0.0005
39+
csv; pandas 0.2254 0.1952 0.0028
40+
binary 0.2271 0.1763 0.0001
4141

4242
Parameter(s) = scalar,vector; run = short. cache = True; usecache = False
4343
_____________________________________________________________
4444
Method total d/l->file read & parse file
4545
_____________________________________________________________
46-
csv; numpy; no len. 0.2471 0.1848 0.0007
47-
csv; pandas; no len. 0.2412 0.1848 0.0031
48-
csv; numpy 0.2294 0.1802 0.0006
49-
csv; pandas 0.2084 0.1544 0.0029
50-
binary 0.2284 0.1516 0.0003
46+
csv; numpy; no len. 0.2249 0.1970 0.0007
47+
csv; pandas; no len. 0.2544 0.2250 0.0030
48+
csv; numpy 0.2105 0.1820 0.0010
49+
csv; pandas 0.2121 0.1845 0.0030
50+
binary 0.2080 0.1607 0.0001
5151

5252
Parameter(s) = ; run = short. cache = True; usecache = False
5353
_____________________________________________________________
5454
Method total d/l->file read & parse file
5555
_____________________________________________________________
56-
csv; numpy; no len. 0.2335 0.1781 0.0077
57-
csv; pandas; no len. 0.2544 0.1828 0.0199
58-
csv; numpy 0.2141 0.1786 0.0040
59-
csv; pandas 0.2581 0.1776 0.0198
60-
binary 0.2963 0.1950 0.0003
56+
csv; numpy; no len. 0.2480 0.2101 0.0092
57+
csv; pandas; no len. 0.2460 0.1963 0.0195
58+
csv; numpy 0.2222 0.1893 0.0037
59+
csv; pandas 0.2558 0.2041 0.0207
60+
binary 0.2244 0.1733 0.0001

‎hapiclient/test/test_chunking.log‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -2,161 +2,161 @@ ________________________________________________________________________________
22
request : dataset3, scalar, 1971-01-01T01:50:00Z, 1975-08-03T06:50:00Z, P1D
33
options 1: {'cache': False, 'logging': False, 'usecache': False, 'dt_chunk': None}
44
options 2: {'cache': False, 'logging': False, 'usecache': False}
5-
x_totalTime1 = 0.8896 s
6-
x_totalTime2 = 0.2953 s
5+
x_totalTime1 = 0.2402 s
6+
x_totalTime2 = 0.1961 s
77
________________________________________________________________________________
88
request : dataset3, scalar, 1971-01-01T01:50:00Z, 1975-08-03T06:50:00Z, P1D
99
options 1: {'cache': False, 'logging': False, 'usecache': False, 'dt_chunk': None}
1010
options 2: {'cache': False, 'logging': False, 'usecache': False, 'n_chunks': 2}
11-
x_totalTime1 = 0.8896 s
12-
x_totalTime2 = 0.4845 s
11+
x_totalTime1 = 0.2402 s
12+
x_totalTime2 = 0.3925 s
1313
________________________________________________________________________________
1414
request : dataset3, scalar, 1971-01-01T01:50:00Z, 1975-08-03T06:50:00Z, P1D
1515
options 1: {'cache': False, 'logging': False, 'usecache': False, 'dt_chunk': None}
1616
options 2: {'cache': False, 'logging': False, 'usecache': False, 'dt_chunk': 'P1Y'}
17-
x_totalTime1 = 0.8896 s
18-
x_totalTime2 = 1.0794 s
17+
x_totalTime1 = 0.2402 s
18+
x_totalTime2 = 0.8546 s
1919
________________________________________________________________________________
2020
request : dataset3, scalar, 1971-01-01T01:50:00Z, 1975-08-03T06:50:00Z, P1D
2121
options 1: {'cache': False, 'logging': False, 'usecache': False, 'dt_chunk': None}
2222
options 2: {'cache': False, 'logging': False, 'usecache': False, 'n_chunks': 2, 'parallel': True}
23-
x_totalTime1 = 0.8896 s
24-
x_totalTime2 = 0.5461 s
23+
x_totalTime1 = 0.2402 s
24+
x_totalTime2 = 0.3477 s
2525
________________________________________________________________________________
2626
request : dataset3, scalar, 1971-01-01T01:50:00Z, 1975-08-03T06:50:00Z, P1D
2727
options 1: {'cache': False, 'logging': False, 'usecache': False, 'dt_chunk': None}
2828
options 2: {'cache': False, 'logging': False, 'usecache': False, 'dt_chunk': 'P1Y', 'parallel': True}
29-
x_totalTime1 = 0.8896 s
30-
x_totalTime2 = 0.8025 s
29+
x_totalTime1 = 0.2402 s
30+
x_totalTime2 = 0.8052 s
3131
________________________________________________________________________________
3232
request : dataset1, scalar, 1970-01-01T00:00:00.000Z, 1970-01-01T05:00:00.000Z, PT1S
3333
options 1: {'cache': False, 'logging': False, 'usecache': False, 'dt_chunk': None}
3434
options 2: {'cache': False, 'logging': False, 'usecache': False}
35-
x_totalTime1 = 0.6847 s
36-
x_totalTime2 = 0.5970 s
35+
x_totalTime1 = 0.4690 s
36+
x_totalTime2 = 0.4048 s
3737
________________________________________________________________________________
3838
request : dataset1, scalar, 1970-01-01T00:00:00.000Z, 1970-01-01T05:00:00.000Z, PT1S
3939
options 1: {'cache': False, 'logging': False, 'usecache': False, 'dt_chunk': None}
4040
options 2: {'cache': False, 'logging': False, 'usecache': False, 'n_chunks': 2}
41-
x_totalTime1 = 0.6847 s
42-
x_totalTime2 = 1.0687 s
41+
x_totalTime1 = 0.4690 s
42+
x_totalTime2 = 0.6591 s
4343
________________________________________________________________________________
4444
request : dataset1, scalar, 1970-01-01T00:00:00.000Z, 1970-01-01T05:00:00.000Z, PT1S
4545
options 1: {'cache': False, 'logging': False, 'usecache': False, 'dt_chunk': None}
4646
options 2: {'cache': False, 'logging': False, 'usecache': False, 'dt_chunk': 'PT1H'}
47-
x_totalTime1 = 0.6847 s
48-
x_totalTime2 = 2.3736 s
47+
x_totalTime1 = 0.4690 s
48+
x_totalTime2 = 1.7560 s
4949
________________________________________________________________________________
5050
request : dataset1, scalar, 1970-01-01T00:00:00.000Z, 1970-01-01T05:00:00.000Z, PT1S
5151
options 1: {'cache': False, 'logging': False, 'usecache': False, 'dt_chunk': None}
5252
options 2: {'cache': False, 'logging': False, 'usecache': False, 'n_chunks': 2, 'parallel': True}
53-
x_totalTime1 = 0.6847 s
54-
x_totalTime2 = 0.7031 s
53+
x_totalTime1 = 0.4690 s
54+
x_totalTime2 = 0.4546 s
5555
________________________________________________________________________________
5656
request : dataset1, scalar, 1970-01-01T00:00:00.000Z, 1970-01-01T05:00:00.000Z, PT1S
5757
options 1: {'cache': False, 'logging': False, 'usecache': False, 'dt_chunk': None}
5858
options 2: {'cache': False, 'logging': False, 'usecache': False, 'dt_chunk': 'PT1H', 'parallel': True}
59-
x_totalTime1 = 0.6847 s
60-
x_totalTime2 = 1.0276 s
59+
x_totalTime1 = 0.4690 s
60+
x_totalTime2 = 0.7467 s
6161
________________________________________________________________________________
6262
request : dataset2, scalar, 1970-01-01T00:00:00.000Z, 1970-01-10T00:00:00.000Z, PT1H
6363
options 1: {'cache': False, 'logging': False, 'usecache': False, 'dt_chunk': None}
6464
options 2: {'cache': False, 'logging': False, 'usecache': False}
65-
x_totalTime1 = 0.2410 s
66-
x_totalTime2 = 0.2066 s
65+
x_totalTime1 = 0.1657 s
66+
x_totalTime2 = 0.1713 s
6767
________________________________________________________________________________
6868
request : dataset2, scalar, 1970-01-01T00:00:00.000Z, 1970-01-10T00:00:00.000Z, PT1H
6969
options 1: {'cache': False, 'logging': False, 'usecache': False, 'dt_chunk': None}
7070
options 2: {'cache': False, 'logging': False, 'usecache': False, 'n_chunks': 2}
71-
x_totalTime1 = 0.2410 s
72-
x_totalTime2 = 0.4295 s
71+
x_totalTime1 = 0.1657 s
72+
x_totalTime2 = 0.3497 s
7373
________________________________________________________________________________
7474
request : dataset2, scalar, 1970-01-01T00:00:00.000Z, 1970-01-10T00:00:00.000Z, PT1H
7575
options 1: {'cache': False, 'logging': False, 'usecache': False, 'dt_chunk': None}
7676
options 2: {'cache': False, 'logging': False, 'usecache': False, 'dt_chunk': 'P1D'}
77-
x_totalTime1 = 0.2410 s
78-
x_totalTime2 = 2.2053 s
77+
x_totalTime1 = 0.1657 s
78+
x_totalTime2 = 1.7279 s
7979
________________________________________________________________________________
8080
request : dataset2, scalar, 1970-01-01T00:00:00.000Z, 1970-01-10T00:00:00.000Z, PT1H
8181
options 1: {'cache': False, 'logging': False, 'usecache': False, 'dt_chunk': None}
8282
options 2: {'cache': False, 'logging': False, 'usecache': False, 'n_chunks': 2, 'parallel': True}
83-
x_totalTime1 = 0.2410 s
84-
x_totalTime2 = 0.4458 s
83+
x_totalTime1 = 0.1657 s
84+
x_totalTime2 = 0.3737 s
8585
________________________________________________________________________________
8686
request : dataset2, scalar, 1970-01-01T00:00:00.000Z, 1970-01-10T00:00:00.000Z, PT1H
8787
options 1: {'cache': False, 'logging': False, 'usecache': False, 'dt_chunk': None}
8888
options 2: {'cache': False, 'logging': False, 'usecache': False, 'dt_chunk': 'P1D', 'parallel': True}
89-
x_totalTime1 = 0.2410 s
90-
x_totalTime2 = 1.3257 s
89+
x_totalTime1 = 0.1657 s
90+
x_totalTime2 = 1.3813 s
9191
________________________________________________________________________________
9292
request : dataset3, scalar, 1971-01-01T01:50:00Z, 1971-08-03T06:50:00Z, P1D
9393
options 1: {'cache': False, 'logging': False, 'usecache': False, 'dt_chunk': None}
9494
options 2: {'cache': False, 'logging': False, 'usecache': False}
95-
x_totalTime1 = 0.2198 s
96-
x_totalTime2 = 0.2211 s
95+
x_totalTime1 = 0.1838 s
96+
x_totalTime2 = 0.1661 s
9797
________________________________________________________________________________
9898
request : dataset3, scalar, 1971-01-01T01:50:00Z, 1971-08-03T06:50:00Z, P1D
9999
options 1: {'cache': False, 'logging': False, 'usecache': False, 'dt_chunk': None}
100100
options 2: {'cache': False, 'logging': False, 'usecache': False, 'n_chunks': 2}
101-
x_totalTime1 = 0.2198 s
102-
x_totalTime2 = 0.4082 s
101+
x_totalTime1 = 0.1838 s
102+
x_totalTime2 = 0.3544 s
103103
________________________________________________________________________________
104104
request : dataset3, scalar, 1971-01-01T01:50:00Z, 1971-08-03T06:50:00Z, P1D
105105
options 1: {'cache': False, 'logging': False, 'usecache': False, 'dt_chunk': None}
106106
options 2: {'cache': False, 'logging': False, 'usecache': False, 'dt_chunk': 'P1M'}
107-
x_totalTime1 = 0.2198 s
108-
x_totalTime2 = 1.7062 s
107+
x_totalTime1 = 0.1838 s
108+
x_totalTime2 = 1.3483 s
109109
________________________________________________________________________________
110110
request : dataset3, scalar, 1971-01-01T01:50:00Z, 1971-08-03T06:50:00Z, P1D
111111
options 1: {'cache': False, 'logging': False, 'usecache': False, 'dt_chunk': None}
112112
options 2: {'cache': False, 'logging': False, 'usecache': False, 'n_chunks': 2, 'parallel': True}
113-
x_totalTime1 = 0.2198 s
114-
x_totalTime2 = 0.5407 s
113+
x_totalTime1 = 0.1838 s
114+
x_totalTime2 = 0.4769 s
115115
________________________________________________________________________________
116116
request : dataset3, scalar, 1971-01-01T01:50:00Z, 1971-08-03T06:50:00Z, P1D
117117
options 1: {'cache': False, 'logging': False, 'usecache': False, 'dt_chunk': None}
118118
options 2: {'cache': False, 'logging': False, 'usecache': False, 'dt_chunk': 'P1M', 'parallel': True}
119-
x_totalTime1 = 0.2198 s
120-
x_totalTime2 = 1.3219 s
119+
x_totalTime1 = 0.1838 s
120+
x_totalTime2 = 1.0782 s
121121
________________________________________________________________________________
122122
request : dataset1, scalar, 1970-01-01T00:00:00.000Z, 1970-01-01T08:00:00Z, PT1S
123123
options 1: {'cache': False, 'logging': False, 'usecache': False, 'dt_chunk': None}
124124
options 2: {'cache': False, 'logging': False, 'usecache': False, 'dt_chunk': 'infer'}
125-
x_totalTime1 = 0.7797 s
126-
x_totalTime2 = 0.7756 s
125+
x_totalTime1 = 0.6372 s
126+
x_totalTime2 = 0.6758 s
127127
________________________________________________________________________________
128128
request : dataset1, scalar, 1970-01-01T00:00:00.000Z, 1970-01-01T05:00:00.000Z, PT1S
129129
options 1: {'cache': False, 'usecache': False, 'dt_chunk': None}
130130
options 2: {'cache': False, 'usecache': False, 'dt_chunk': 'infer'}
131-
x_totalTime1 = 0.6551 s
132-
x_totalTime2 = 0.6555 s
131+
x_totalTime1 = 0.4749 s
132+
x_totalTime2 = 0.5107 s
133133
________________________________________________________________________________
134134
request : dataset1, scalar, 1970-01-01T00:00:00.000Z, 1970-01-01T05:00:00.000Z, PT1S
135135
options 1: {'cache': False, 'usecache': False, 'dt_chunk': None}
136136
options 2: {'cache': False, 'usecache': False, 'dt_chunk': 'infer'}
137-
x_totalTime1 = 0.6551 s
138-
x_totalTime2 = 0.9336 s
137+
x_totalTime1 = 0.4749 s
138+
x_totalTime2 = 0.4482 s
139139
________________________________________________________________________________
140140
request : dataset1, scalar, 1970-01-01T00:00:00.000Z, 1970-01-01T05:00:00.000Z, PT1S
141141
options 1: {'cache': False, 'usecache': False, 'dt_chunk': None}
142142
options 2: {'cache': False, 'usecache': False, 'dt_chunk': 'infer'}
143-
x_totalTime1 = 0.6551 s
144-
x_totalTime2 = 1.5967 s
143+
x_totalTime1 = 0.4749 s
144+
x_totalTime2 = 0.4602 s
145145
________________________________________________________________________________
146146
request : ace, X_GSM, 2000-01-01T00:00:00.000Z, 2000-01-02T00:00:00.000Z, PT720S
147147
options 1: {'cache': False, 'usecache': False, 'dt_chunk': None}
148148
options 2: {'cache': False, 'usecache': False, 'dt_chunk': 'infer'}
149-
x_totalTime1 = 1.6808 s
150-
x_totalTime2 = 2.3436 s
149+
x_totalTime1 = 1.1916 s
150+
x_totalTime2 = 2.2761 s
151151
________________________________________________________________________________
152152
request : ace, X_GSM, 2000-01-01T00:00:00.000Z, 2000-01-02T00:00:00.000Z, PT720S
153153
options 1: {'cache': False, 'usecache': False, 'dt_chunk': None}
154154
options 2: {'cache': False, 'usecache': False, 'dt_chunk': 'infer'}
155-
x_totalTime1 = 1.6808 s
156-
x_totalTime2 = 2.4476 s
155+
x_totalTime1 = 1.1916 s
156+
x_totalTime2 = 2.2889 s
157157
________________________________________________________________________________
158158
request : ace, X_GSM, 2000-01-01T00:00:00.000Z, 2000-01-02T00:00:00.000Z, PT720S
159159
options 1: {'cache': False, 'usecache': False, 'dt_chunk': None}
160160
options 2: {'cache': False, 'usecache': False, 'dt_chunk': 'infer'}
161-
x_totalTime1 = 1.6808 s
162-
x_totalTime2 = 2.2965 s
161+
x_totalTime1 = 1.1916 s
162+
x_totalTime2 = 2.3684 s

0 commit comments

Comments
 (0)