Showing with 21,229 additions and 11,725 deletions.
  1. +46 −51 .circleci/config.yml
  2. +13 −7 .coveragerc
  3. +0 −25 .landscape.yaml
  4. +0 −1 MANIFEST.in
  5. +50 −16 Makefile
  6. +10 −4 README.md
  7. +3 −6 appveyor.yml
  8. +7 −7 asv.conf.json
  9. +21 −1 benchmarks/benchmarks.py
  10. +8 −6 ci/Dockerfile
  11. +17 −5 ci/build.sh
  12. +258 −18 ci/datamgr.py
  13. +77 −30 ci/docker-compose.yml
  14. +115 −0 ci/feedstock.py
  15. +100 −97 ci/impalamgr.py
  16. +1 −2 ci/load-data.sh
  17. +1 −0 ci/mapd.conf
  18. +8 −3 ci/requirements-dev-2.7.yml
  19. +0 −28 ci/requirements-dev-3.4.yml
  20. +9 −3 ci/requirements-dev-3.5.yml
  21. +8 −2 ci/requirements-dev-3.6.yml
  22. +11 −3 ci/requirements-docs-3.6.yml
  23. +72 −0 ci/schema/mapd.sql
  24. +38 −0 ci/setup_docker_volume.sh
  25. +4 −2 ci/test.sh
  26. +7 −0 codecov.yml
  27. +0 −8 conda-recipes/hdfs/bld.bat
  28. +0 −9 conda-recipes/hdfs/build.sh
  29. +0 −42 conda-recipes/hdfs/meta.yaml
  30. +0 −10 conda-recipes/ibis-framework/bld.bat
  31. +0 −10 conda-recipes/ibis-framework/build.sh
  32. +0 −83 conda-recipes/ibis-framework/meta.yaml
  33. +0 −8 conda-recipes/impyla/bld.bat
  34. +0 −9 conda-recipes/impyla/build.sh
  35. +0 −39 conda-recipes/impyla/meta.yaml
  36. +0 −8 conda-recipes/sasl/bld.bat
  37. +0 −9 conda-recipes/sasl/build.sh
  38. +0 −63 conda-recipes/sasl/meta.yaml
  39. +0 −8 conda-recipes/thrift/bld.bat
  40. +0 −9 conda-recipes/thrift/build.sh
  41. +0 −28 conda-recipes/thrift/meta.yaml
  42. +0 −8 conda-recipes/thrift_sasl/bld.bat
  43. +0 −9 conda-recipes/thrift_sasl/build.sh
  44. +0 −65 conda-recipes/thrift_sasl/meta.yaml
  45. +0 −8 conda-recipes/thriftpy/bld.bat
  46. +0 −9 conda-recipes/thriftpy/build.sh
  47. +0 −43 conda-recipes/thriftpy/meta.yaml
  48. +31 −0 conftest.py
  49. +0 −7 docs/README
  50. +0 −4 docs/requirements-docs.txt
  51. BIN docs/source/_static/favicon.ico
  52. +146 −0 docs/source/_static/favicon.svg
  53. +135 −0 docs/source/_static/logo-wide.svg
  54. +128 −0 docs/source/_static/logo.svg
  55. +92 −1 docs/source/api.rst
  56. +1 −1 docs/source/conf.py
  57. +35 −0 docs/source/contributing.rst
  58. +38 −57 docs/source/developer.rst
  59. +4 −2 docs/source/extending.rst
  60. +28 −45 docs/source/getting-started.rst
  61. +2 −25 docs/source/impala.rst
  62. +13 −14 docs/source/index.rst
  63. +356 −0 docs/source/notebooks/tutorial/10-Adding-a-new-reduction-expression.ipynb
  64. +18 −16 ...otebooks/tutorial/{9-Adding-a-new-expression.ipynb → 9-Adding-a-new-elementwise-expression.ipynb}
  65. +62 −1 docs/source/release.rst
  66. +2 −0 docs/source/tutorial.rst
  67. +69 −5 docs/source/udf.rst
  68. +10 −3 ibis/__init__.py
  69. +9 −2 ibis/bigquery/api.py
  70. +261 −195 ibis/bigquery/client.py
  71. +222 −43 ibis/bigquery/compiler.py
  72. +120 −0 ibis/bigquery/datatypes.py
  73. +43 −3 ibis/bigquery/tests/conftest.py
  74. +369 −38 ibis/bigquery/tests/test_client.py
  75. +498 −2 ibis/bigquery/tests/test_compiler.py
  76. +84 −0 ibis/bigquery/tests/test_datatypes.py
  77. +1 −0 ibis/bigquery/udf/__init__.py
  78. +236 −0 ibis/bigquery/udf/api.py
  79. +638 −0 ibis/bigquery/udf/core.py
  80. +70 −0 ibis/bigquery/udf/find.py
  81. +58 −0 ibis/bigquery/udf/rewrite.py
  82. 0 ibis/bigquery/udf/tests/__init__.py
  83. +542 −0 ibis/bigquery/udf/tests/test_core.py
  84. +83 −0 ibis/bigquery/udf/tests/test_find.py
  85. +254 −0 ibis/bigquery/udf/tests/test_udf_execute.py
  86. +91 −80 ibis/clickhouse/client.py
  87. +14 −10 ibis/clickhouse/operations.py
  88. +3 −2 ibis/clickhouse/tests/test_client.py
  89. +7 −4 ibis/clickhouse/tests/test_functions.py
  90. +9 −22 ibis/clickhouse/tests/test_operators.py
  91. +13 −12 ibis/clickhouse/tests/test_select.py
  92. +13 −2 ibis/clickhouse/tests/test_types.py
  93. +37 −82 ibis/client.py
  94. +4 −0 ibis/common.py
  95. +8 −4 ibis/compat.py
  96. +71 −21 ibis/expr/analysis.py
  97. +33 −61 ibis/expr/analytics.py
  98. +574 −398 ibis/expr/api.py
  99. +189 −84 ibis/expr/datatypes.py
  100. +10 −7 ibis/expr/format.py
  101. +1,168 −1,133 ibis/expr/operations.py
  102. +273 −806 ibis/expr/rules.py
  103. +15 −12 ibis/expr/schema.py
  104. +205 −0 ibis/expr/signature.py
  105. +1 −3 ibis/expr/tests/mocks.py
  106. +4 −1 ibis/expr/tests/test_analysis.py
  107. +23 −18 ibis/expr/tests/test_case.py
  108. +41 −47 ibis/expr/tests/test_datatypes.py
  109. +44 −35 ibis/expr/tests/test_decimal.py
  110. +1 −0 ibis/expr/tests/test_format.py
  111. +7 −0 ibis/expr/tests/test_interactive.py
  112. +113 −0 ibis/expr/tests/test_operations.py
  113. +257 −366 ibis/expr/tests/test_rules.py
  114. +19 −0 ibis/expr/tests/test_schema.py
  115. +234 −0 ibis/expr/tests/test_signature.py
  116. +22 −22 ibis/expr/tests/test_sql_builtins.py
  117. +2 −2 ibis/expr/tests/test_string.py
  118. +24 −28 ibis/expr/tests/test_table.py
  119. +49 −4 ibis/expr/tests/test_temporal.py
  120. +57 −19 ibis/expr/tests/test_timestamp.py
  121. +258 −81 ibis/expr/tests/test_value_exprs.py
  122. +29 −22 ibis/expr/tests/test_visualize.py
  123. +5 −0 ibis/expr/tests/test_window_functions.py
  124. +245 −895 ibis/expr/types.py
  125. +8 −22 ibis/expr/visualize.py
  126. +126 −55 ibis/expr/window.py
  127. +2 −4 ibis/file/client.py
  128. +7 −11 ibis/file/csv.py
  129. +6 −10 ibis/file/hdf5.py
  130. +11 −12 ibis/file/parquet.py
  131. +1 −1 ibis/file/tests/test_csv.py
  132. +2 −1 ibis/file/tests/test_hdf5.py
  133. +2 −1 ibis/file/tests/test_parquet.py
  134. +1 −1 ibis/file/tests/test_schema.py
  135. +0 −13 ibis/impala/api.py
  136. +1,102 −1,234 ibis/impala/client.py
  137. +160 −42 ibis/impala/compiler.py
  138. +46 −93 ibis/impala/ddl.py
  139. +0 −179 ibis/impala/tests/common.py
  140. +332 −0 ibis/impala/tests/conftest.py
  141. +356 −318 ibis/impala/tests/test_client.py
  142. +11 −27 ibis/impala/tests/test_connection_pool.py
  143. +254 −1,041 ibis/impala/tests/test_ddl.py
  144. +516 −0 ibis/impala/tests/test_ddl_compilation.py
  145. +665 −632 ibis/impala/tests/test_exprs.py
  146. +2 −18 ibis/impala/tests/test_kudu_support.py
  147. +0 −14 ibis/impala/tests/test_metadata.py
  148. +109 −238 ibis/impala/tests/test_pandas_interop.py
  149. +98 −0 ibis/impala/tests/test_parquet_ddl.py
  150. +232 −255 ibis/impala/tests/test_partition.py
  151. +89 −0 ibis/impala/tests/test_patched.py
  152. +19 −14 ibis/impala/tests/test_sql.py
  153. +258 −238 ibis/impala/tests/test_udf.py
  154. +40 −69 ibis/impala/tests/test_window.py
  155. +35 −35 ibis/impala/udf.py
  156. +375 −0 ibis/mapd/README.rst
  157. 0 ibis/mapd/__init__.py
  158. +64 −0 ibis/mapd/api.py
  159. +796 −0 ibis/mapd/client.py
  160. +243 −0 ibis/mapd/compiler.py
  161. +422 −0 ibis/mapd/ddl.py
  162. +144 −0 ibis/mapd/identifiers.py
  163. +692 −0 ibis/mapd/operations.py
  164. 0 ibis/mapd/tests/__init__.py
  165. +52 −0 ibis/mapd/tests/conftest.py
  166. +62 −0 ibis/mapd/tests/test_client.py
  167. +53 −0 ibis/mapd/tests/test_operations.py
  168. +111 −37 ibis/pandas/aggcontext.py
  169. +1 −2 ibis/pandas/api.py
  170. +272 −66 ibis/pandas/client.py
  171. +281 −137 ibis/pandas/core.py
  172. +68 −20 ibis/pandas/dispatch.py
  173. +5 −3 ibis/pandas/execution/__init__.py
  174. +3 −8 ibis/pandas/execution/arrays.py
  175. +1 −2 ibis/pandas/execution/constants.py
  176. +4 −1 ibis/pandas/{ → execution}/decimal.py
  177. +350 −101 ibis/pandas/execution/generic.py
  178. +10 −6 ibis/pandas/execution/join.py
  179. +219 −0 ibis/pandas/execution/maps.py
  180. +50 −27 ibis/pandas/execution/selection.py
  181. +9 −6 ibis/pandas/execution/strings.py
  182. +147 −13 ibis/pandas/execution/temporal.py
  183. +17 −11 ibis/pandas/execution/tests/conftest.py
  184. +220 −0 ibis/pandas/execution/tests/test_arrays.py
  185. +10 −52 ibis/pandas/execution/tests/test_functions.py
  186. +35 −10 ibis/pandas/execution/tests/test_join.py
  187. +78 −0 ibis/pandas/execution/tests/test_maps.py
  188. +162 −253 ibis/pandas/execution/tests/test_operations.py
  189. +41 −3 ibis/pandas/execution/tests/{test_datetimelike.py → test_temporal.py}
  190. +174 −65 ibis/pandas/execution/tests/test_window.py
  191. +25 −10 ibis/pandas/execution/util.py
  192. +174 −58 ibis/pandas/execution/window.py
  193. +48 −1 ibis/pandas/tests/test_client.py
  194. +58 −39 ibis/pandas/tests/test_core.py
  195. +127 −1 ibis/pandas/tests/test_datatypes.py
  196. +13 −0 ibis/pandas/tests/test_schema.py
  197. +21 −2 ibis/pandas/tests/test_udf.py
  198. +17 −11 ibis/pandas/udf.py
  199. +102 −84 ibis/sql/alchemy.py
  200. +197 −109 ibis/sql/compiler.py
  201. +3 −2 ibis/sql/mysql/client.py
  202. +14 −6 ibis/sql/mysql/compiler.py
  203. +1 −1 ibis/sql/postgres/api.py
  204. +3 −8 ibis/sql/postgres/client.py
  205. +34 −33 ibis/sql/postgres/compiler.py
  206. +49 −45 ibis/sql/postgres/tests/test_functions.py
  207. +13 −17 ibis/sql/sqlite/client.py
  208. +28 −0 ibis/sql/sqlite/compiler.py
  209. +3 −4 ibis/sql/sqlite/tests/conftest.py
  210. +1 −15 ibis/sql/sqlite/tests/test_client.py
  211. +12 −3 ibis/sql/sqlite/tests/test_functions.py
  212. +35 −34 ibis/sql/tests/test_compiler.py
  213. +1 −1 ibis/sql/tests/test_sqlalchemy.py
  214. +14 −20 ibis/sql/transforms.py
  215. +20 −20 ibis/tests/all/conftest.py
  216. +1 −0 ibis/tests/all/test_aggregation.py
  217. +9 −5 ibis/tests/all/test_client.py
  218. +58 −3 ibis/tests/all/test_generic.py
  219. +219 −43 ibis/tests/all/test_numeric.py
  220. +39 −10 ibis/tests/all/test_param.py
  221. +7 −5 ibis/tests/all/test_string.py
  222. +188 −28 ibis/tests/all/test_temporal.py
  223. +142 −38 ibis/tests/backends.py
  224. +5 −21 ibis/tests/test_filesystems.py
  225. +0 −11 ibis/tests/test_util.py
  226. +12 −0 ibis/tests/util.py
  227. +138 −76 ibis/util.py
  228. +4 −2 requirements.txt
  229. +4 −0 setup.cfg
  230. +15 −9 setup.py
97 changes: 46 additions & 51 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version: 2
base: &base
machine:
image: circleci/classic:latest
docker_layer_caching: true
docker_layer_caching: false
working_directory: ~/ibis/ci


Expand All @@ -22,7 +22,7 @@ test: &test
fi
- run:
name: Start Databases
command: docker-compose up -d --no-build mysql postgres impala clickhouse
command: docker-compose up -d --no-build mysql postgres impala clickhouse mapd kudu-tserver kudu-master
- run:
name: Show Running Containers
command: docker ps
Expand All @@ -40,25 +40,41 @@ test: &test
command: docker-compose run waiter
- run:
name: Load Test Datasets
command: docker-compose run ibis ci/load-data.sh
command: docker-compose run -e LOGLEVEL=DEBUG ibis ci/load-data.sh
- run:
name: Make test reports directory
command: sudo mkdir -p /tmp/ibis/test-reports/pytest
name: Make artifacts directories
command: |
sudo mkdir -p /tmp/ibis/test-reports/pytest
mkdir -p /tmp/env
- run:
name: Show packages in conda environment
command: docker-compose run ibis conda list
- run:
name: Capture the exact environment used
command: docker-compose run ibis conda env export > /tmp/env/env.yml
- run:
name: Execute Pytest
command: |
docker-compose run ibis pytest -rsxX \
--doctest-modules \
--doctest-ignore-import-errors \
--junitxml=/tmp/test-reports/pytest/junit.xml \
--tb=short -m "not udf" ibis
docker-compose run -e PYTHONHASHSEED=$PYTHONHASHSEED ibis \
pytest ibis -m "not udf" \
-ra \
--numprocesses auto \
--doctest-modules \
--doctest-ignore-import-errors \
--junitxml=/tmp/test-reports/pytest/junit.xml \
--cov=ibis \
--cov-report=xml:/tmp/test-reports/pytest-cov/coverage.xml
- store_test_results:
path: /tmp/ibis/test-reports
- store_artifacts:
path: /tmp/ibis/test-reports
- store_artifacts:
path: /tmp/env/env.yml
- run:
name: Upload Coverage
command: |
bash <(curl -s https://codecov.io/bash) \
-f /tmp/ibis/test-reports/pytest-cov/coverage.xml
build: &build
Expand All @@ -73,11 +89,15 @@ build: &build
name: List Docker Images
command: docker images
- run:
name: Build Conda Recipe
command: |
docker-compose run ibis conda build conda-recipes/ibis-framework \
--python "${PYTHON_VERSION}" \
--channel conda-forge
name: Clone, update and build conda-forge recipe
command: docker-compose run ibis ci/feedstock.py test
- run:
name: Permission the host for package deployment
command: sudo chown -R "${USER}":"${USER}" /tmp/ibis/packages
- store_artifacts:
path: /tmp/ibis/packages/linux-64
- store_artifacts:
path: /tmp/ibis/packages/noarch


benchmark: &benchmark
Expand All @@ -104,7 +124,7 @@ docs: &docs
- "8d:b0:36:4d:f6:75:f2:5f:00:01:a1:53:63:52:f0:e2"
- run:
name: Start Databases
command: docker-compose up -d --no-build mysql postgres impala clickhouse
command: docker-compose up -d --no-build mysql postgres impala clickhouse mapd kudu-master kudu-tserver
- run:
name: Show Running Containers
command: docker ps
Expand Down Expand Up @@ -158,33 +178,26 @@ jobs:
python27_test:
<<: *test
environment:
- PYTHONHASHSEED: ""
- PYTHON_VERSION: 2.7

python34_test:
<<: *test
environment:
- PYTHON_VERSION: 3.4

python35_test:
<<: *test
environment:
- PYTHONHASHSEED: 0
- PYTHON_VERSION: 3.5

python36_test:
<<: *test
environment:
- PYTHONHASHSEED: ""
- PYTHON_VERSION: 3.6

python27_conda_build:
<<: *build
environment:
- PYTHON_VERSION: 2.7

python34_conda_build:
<<: *build
environment:
- PYTHON_VERSION: 3.4

python35_conda_build:
<<: *build
environment:
Expand All @@ -211,30 +224,12 @@ workflows:
test:
jobs:
- python27_test
- python34_test
- python35_test
- python36_test
- python27_conda_build

- python27_conda_build:
requires:
- python27_test

- python34_conda_build:
requires:
- python34_test

- python35_conda_build:
requires:
- python35_test

- python36_conda_build:
requires:
- python36_test

- python36_benchmark:
requires:
- python36_test
- python35_test
- python35_conda_build

- python36_docs:
requires:
- python36_test
- python36_test
- python36_conda_build
- python36_benchmark
- python36_docs
20 changes: 13 additions & 7 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
[run]
branch: True
omit: ibis/tests/*,
ibis/*/tests/*,
ibis/cloudpickle.py
ibis/tasks.py
ibis/server.py
ibis/wire.py
branch = True
source = ibis

[report]
exclude_lines =
if self.debug:
pragma: no cover
raise NotImplementedError
if __name__ == .__main__.:
ignore_errors = True
omit =
_version.py
tests/*
25 changes: 0 additions & 25 deletions .landscape.yaml

This file was deleted.

1 change: 0 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ include README.md
include LICENSE.txt
graft ibis
graft LICENSES
graft conda-recipes

graft docs

Expand Down
66 changes: 50 additions & 16 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,27 +1,61 @@
.PHONY: all clean-pyc develop lint test docclean docs docserve

SHELL := /bin/bash
ENVKIND := docs
MAKEFILE_DIR = $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST)))))
COMPOSE_FILE := "$(MAKEFILE_DIR)/ci/docker-compose.yml"
DOCKER := ENVKIND=$(ENVKIND) docker-compose -f $(COMPOSE_FILE)
DOCKER_RUN := $(DOCKER) run --rm

all:
python setup.py build_ext --inplace
clean:
@find . -name '*.pyc' -exec -delete

clean-pyc:
find . -name "*.pyc" -exec rm -rf {} \;

develop: clean-pyc
python setup.py develop
develop: clean
@python setup.py develop

lint:
flake8
@flake8

test:
pytest --pyargs ibis -m 'not impala and not hdfs'
stop:
# stop all running docker compose services
@$(DOCKER) rm --force --stop

docclean:
$(MAKE) -C docs clean
build:
# build the ibis image
@$(DOCKER) build --pull ibis

start:
# start all docker compose services
@$(DOCKER) up -d --no-build mapd postgres mysql clickhouse impala kudu-master kudu-tserver
# wait for services to start
@$(DOCKER_RUN) waiter

load:
@$(DOCKER_RUN) -e LOGLEVEL ibis ci/load-data.sh

docs:
$(MAKE) -C docs html
restart: stop
@$(MAKE) start

docserve: docs
pushd docs/build/html && python -m http.server --bind localhost
init: restart
@$(MAKE) build
@$(MAKE) load

test:
@ENVKIND=$(ENVKIND) $(MAKEFILE_DIR)/ci/test.sh -n auto -m 'not udf'

testfast:
@ENVKIND=$(ENVKIND) $(MAKEFILE_DIR)/ci/test.sh -n auto -m 'not udf and not impala and not bigquery'

docclean:
@$(DOCKER_RUN) ibis rm -rf /tmp/docs.ibis-project.org

docs: docclean
@$(DOCKER_RUN) ibis ping -c 1 quickstart.cloudera
@$(DOCKER_RUN) ibis git clone --branch gh-pages https://github.com/ibis-project/docs.ibis-project.org /tmp/docs.ibis-project.org
@$(DOCKER_RUN) ibis find /tmp/docs.ibis-project.org -maxdepth 1 ! -wholename /tmp/docs.ibis-project.org \
! -name '*.git' \
! -name '.' \
! -name 'CNAME' \
! -name '*.nojekyll' \
-exec rm -rf {} \;
@$(DOCKER_RUN) ibis sphinx-build -b html docs/source /tmp/docs.ibis-project.org -W -j auto -T
14 changes: 10 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
# Ibis: Python data analysis framework for Hadoop and SQL engines

[![Anaconda-Server Badge](https://anaconda.org/conda-forge/ibis-framework/badges/version.svg)](https://anaconda.org/conda-forge/ibis-framework)
[![Documentation Status](https://img.shields.io/badge/docs-docs.ibis--project.org-blue.svg)](http://docs.ibis-project.org)
[![CircleCI Status](https://circleci.com/gh/ibis-project/ibis.svg?style=shield&circle-token=b84ff8383cbb0d6788ee0f9635441cb962949a4f)](https://circleci.com/gh/ibis-project/ibis/tree/master)
[![AppVeyor Status](https://ci.appveyor.com/api/projects/status/github/ibis-project/ibis?branch=master&svg=true)](https://ci.appveyor.com/project/cpcloud/ibis-xh5g1)
|Service|Status|
| -------------: | :---- |
| Documentation | [![Documentation Status](https://img.shields.io/badge/docs-docs.ibis--project.org-blue.svg)](http://docs.ibis-project.org) |
| Conda packages | [![Anaconda-Server Badge](https://anaconda.org/conda-forge/ibis-framework/badges/version.svg)](https://anaconda.org/conda-forge/ibis-framework) |
| PyPI | ![PyPI](https://img.shields.io/pypi/v/ibis-framework.svg) |
| CircleCI | [![CircleCI Status](https://circleci.com/gh/ibis-project/ibis.svg?style=shield&circle-token=b84ff8383cbb0d6788ee0f9635441cb962949a4f)](https://circleci.com/gh/ibis-project/ibis/tree/master) |
| AppVeyor | [![AppVeyor Status](https://ci.appveyor.com/api/projects/status/github/ibis-project/ibis?branch=master&svg=true)](https://ci.appveyor.com/project/cpcloud/ibis-xh5g1) |
| Coverage | ![Codecov branch](https://img.shields.io/codecov/c/github/ibis-project/ibis/master.svg) |


Ibis is a toolbox to bridge the gap between local Python environments, remote
storage, execution systems like Hadoop components (HDFS, Impala, Hive, Spark)
Expand Down Expand Up @@ -33,6 +38,7 @@ Ibis currently provides tools for interacting with the following systems:
- [Pandas](https://pandas.pydata.org/) [DataFrames](http://pandas.pydata.org/pandas-docs/stable/dsintro.html#dataframe) (Experimental)
- [Clickhouse](https://clickhouse.yandex)
- [BigQuery](https://cloud.google.com/bigquery)
- [MapD](https://www.mapd.com/) (Experimental)

Learn more about using the library at http://docs.ibis-project.org and read the
project blog at http://ibis-project.org for news and updates.
9 changes: 3 additions & 6 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ environment:
PGPASSWORD: "Password12!"

IBIS_TEST_DOWNLOAD_DIRECTORY: "%USERPROFILE%"
IBIS_TEST_DOWNLOAD_BASE_URL: "https://storage.googleapis.com/ibis-ci-data"
IBIS_TEST_DOWNLOAD_BASE_URL: "https://storage.googleapis.com/ibis-testing-data"
IBIS_TEST_DOWNLOAD_NAME: "ibis-testing-data.tar.gz"

IBIS_TEST_DATA_DIRECTORY: "%USERPROFILE%\\ibis-testing-data"
Expand All @@ -34,7 +34,6 @@ environment:

matrix:
- PYTHON_VERSION: "2.7"
- PYTHON_VERSION: "3.4"
- PYTHON_VERSION: "3.5"
- PYTHON_VERSION: "3.6"

Expand All @@ -50,15 +49,13 @@ test_script:
- "%CONDA% config --set always_yes true"
- "%CONDA% create --name \"ibis_%PYTHON_VERSION%\" python=%PYTHON_VERSION% --channel conda-forge"
- "%ACTIVATE% \"ibis_%PYTHON_VERSION%\""
- "%CONDA% install --channel conda-forge pytables numpy sqlalchemy psycopg2 graphviz click mock plumbum flake8 pytest"
- "%CONDA% install --channel conda-forge pytables numpy \"sqlalchemy<1.1.15\" psycopg2 graphviz click mock plumbum flake8 pytest pytest-xdist"
- "%CONDA% list"
- "pip install -e .\"[sqlite, postgres, mysql, visualization, pandas, csv, hdf5]\""

- "flake8"

- "python ci\\datamgr.py download"
- "python ci\\datamgr.py parquet -i"
- "python ci\\datamgr.py mysql"
- "python ci\\datamgr.py sqlite"
- "python ci\\datamgr.py postgres"
- "pytest --tb=short -m \"not backend and not clickhouse and not impala and not hdfs and not bigquery\" -rs ibis"
- "pytest --tb=short -n auto -m \"not backend and not clickhouse and not impala and not hdfs and not bigquery and not mapd\" -ra ibis"
14 changes: 7 additions & 7 deletions asv.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@
"six": [],
"multipledispatch": [],
"impyla": [],
"sqlalchemy": []
"sqlalchemy": [],
"pytz": [],
"regex": []
},

// Combinations of libraries/python versions can be excluded/included
Expand Down Expand Up @@ -88,12 +90,10 @@
// {"environment_type": "conda", "six": null}, // don't run without six on conda
// ],
//
// "include": [
// // additional env for python2.7
// {"python": "2.7", "numpy": "1.8"},
// // additional env if run on windows+conda
// {"platform": "win32", "environment_type": "conda", "python": "2.7", "libpython": ""},
// ],
"include": [
// additional env for python2.7
{"python": "2.7", "funcsigs": [], "enum34": [], "functools32": []}
],

// The directory (relative to the current directory) that benchmarks are
// stored in. If not provided, defaults to "benchmarks"
Expand Down
Loading