Skip to content

Commit b8e5087

Browse files
authored
issue pandas-dev#629 - Columns fix (pandas-dev#631)
* Update numpy_arrays.py * test for fix * update changelog * Remove circle build status since arctic still doesnt support circle 2.0
1 parent 5ef7f32 commit b8e5087

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

CHANGES.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
## Changelog
22

3-
### 1.69
3+
### 1.70
4+
* Bugfix: #629 - Column kwarg no longer modified
5+
6+
### 1.69 (2018-09-12)
47
* Docs: VersionStore documentation
58
* Bugfix: Issue #612 ThreadPool should be created by process using it
69
* Feature: Upsert option on appends in ChunkStore

README.md

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# [![arctic](logo/arctic_50.png)](https://github.com/manahl/arctic) [Arctic TimeSeries and Tick store](https://github.com/manahl/arctic)
22

33

4-
[![Circle CI](https://circleci.com/gh/manahl/arctic.svg?style=shield)](https://circleci.com/gh/manahl/arctic)
54
[![Travis CI](https://travis-ci.org/manahl/arctic.svg?branch=master)](https://travis-ci.org/manahl/arctic)
65
[![Coverage Status](https://coveralls.io/repos/github/manahl/arctic/badge.svg?branch=master)](https://coveralls.io/github/manahl/arctic?branch=master)
76
[![Code Health](https://landscape.io/github/manahl/arctic/master/landscape.svg?style=flat)](https://landscape.io/github/manahl/arctic/master)

arctic/serialization/numpy_arrays.py

+1
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ def deserialize(self, data, columns=None):
208208

209209
if columns:
210210
if index:
211+
columns = list(columns)
211212
columns.extend(meta[INDEX])
212213
if len(columns) > len(set(columns)):
213214
raise Exception("Duplicate columns specified, cannot de-serialize")

tests/integration/chunkstore/test_chunkstore.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -854,10 +854,11 @@ def test_read_column_subset(chunkstore_lib):
854854
(dt(2016, 3, 3), 1)],
855855
names=['date', 'id'])
856856
)
857-
857+
cols = ['prev_close', 'volume']
858858
chunkstore_lib.write('test', df, chunk_size='D')
859-
r = chunkstore_lib.read('test', columns=['prev_close', 'volume'])
860-
assert_frame_equal(r, df[['prev_close', 'volume']])
859+
r = chunkstore_lib.read('test', columns=cols)
860+
assert cols == ['prev_close', 'volume']
861+
assert_frame_equal(r, df[cols])
861862

862863

863864
def test_rename(chunkstore_lib):

0 commit comments

Comments
 (0)