Skip to content

Commit 32762e7

Browse files
committed
test using pip instead of setup.py
1 parent 2f1a906 commit 32762e7

File tree

3 files changed

+11
-21
lines changed

3 files changed

+11
-21
lines changed

.circleci/config.yml

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -153,24 +153,7 @@ python: &python
153153
command: |
154154
virtualenv ci
155155
. ci/bin/activate
156-
# xlrd & xarray do not load correctly from "python setup.py develop"
157-
# possibly switch this script to use "pip install -r requirements.txt"
158-
pip install pillow
159-
pip install xlrd
160-
pip install xarray
161-
if [ "${CIRCLE_JOB}" == "build_3_10" ]; then
162-
pip install pybind11
163-
pip install -r requirements.txt
164-
fi
165-
# dash>=2.0.0 has a dependency on typing_extensions>=3.6.4 and for some reason circleci allows you to
166-
# download versions greater than 4.1.1 which aren't compatible with python 3.6
167-
if [ "${CIRCLE_JOB}" == "build_3_6" ]; then
168-
pip install typing_extensions==4.1.1
169-
pip install soupsieve==2.3.2
170-
fi
171-
if [ "${CIRCLE_JOB}" == "build_3_8" ]; then
172-
pip install contourpy
173-
fi
156+
pip install -r requirements.txt
174157
python setup.py develop
175158
- run:
176159
name: Print environment

dtale/views.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4439,12 +4439,19 @@ def load_arcticdb_description():
44394439
sorted(description.columns, key=lambda c: c.name),
44404440
)
44414441
)
4442+
4443+
if isinstance(description.index, (list, tuple)):
4444+
description_index = [(i.name, i.dtype) for i in description.index]
4445+
elif description.index is None:
4446+
description_index = []
4447+
else:
4448+
description_index = list(zip(description.index.name, description.index.dtype))
44424449
index = list(
44434450
map(
44444451
lambda i: "{} ({})".format(
44454452
i[0], _TYPEDESCRIPTOR_VALUETYPE.values[i[1].value_type].name
44464453
),
4447-
zip(description.index.name, description.index.dtype),
4454+
description_index,
44484455
)
44494456
)
44504457
rows = description.row_count

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
lz4<=2.2.1; python_version < '3.0'
2-
lz4<=3.1.10; python_version < '3.6'
1+
lz4<=2.2.1; python_version == '2.7'
2+
lz4<=3.1.10; python_version == '3.6'
33
lz4; python_version > '3.6'
44
beautifulsoup4!=4.13.0b2; python_version > '3.0'
55
beautifulsoup4<=4.9.3; python_version == '2.7'

0 commit comments

Comments
 (0)