Skip to content

Commit

Permalink
BLD/CLN/BUG: Fix requirements and setup.py to match conda
Browse files Browse the repository at this point in the history
Author: Phillip Cloud <cpcloud@gmail.com>

Closes #1603 from cpcloud/fix-setup-py and squashes the following commits:

91349c1 [Phillip Cloud] mapd only supported on python3 for now
bee5776 [Phillip Cloud] BLD/CLN/BUG: Fix requirements and setup.py to match conda
  • Loading branch information
cpcloud committed Aug 21, 2018
1 parent 3f230de commit 62b0303
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
5 changes: 3 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ enum34; python_version < '3'
funcsigs; python_version < '3'
functools32; python_version < '3'
multipledispatch
numpy>=1.10.0
pandas>=0.18.1
numpy>=1.11
pandas>=0.20
pathlib2; python_version < '3'
pytz
regex
six
Expand Down
9 changes: 3 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
mapd_requires = ['pymapd']
kerberos_requires = ['requests-kerberos']
visualization_requires = ['graphviz']
clickhouse_requires = ['clickhouse-driver>=0.0.8']
clickhouse_requires = ['clickhouse-driver>=0.0.8', 'clickhouse-cityhash']
bigquery_requires = ['google-cloud-bigquery>=1.0.0']
hdf5_requires = ['tables>=3.0.0']
parquet_requires = ['pyarrow>=0.6.0']
Expand Down Expand Up @@ -78,14 +78,11 @@
'impala:python_version >= "3"': impala_requires,
'kerberos': kerberos_requires,
'postgres': postgres_requires,
'mapd': mapd_requires,
'mapd:python_version >= "3"': mapd_requires,
'mysql': mysql_requires,
'sqlite': sqlite_requires,
'visualization': visualization_requires,
'clickhouse:python_version != "3.4"': clickhouse_requires + [
'clickhouse-cityhash'
],
'clickhouse:python_version == "3.4"': clickhouse_requires,
'clickhouse': clickhouse_requires,
'bigquery': bigquery_requires,
'csv:python_version < "3"': ['pathlib2'],
'hdf5': hdf5_requires,
Expand Down

0 comments on commit 62b0303

Please sign in to comment.