Skip to content

Commit

Permalink
Test with pyarrow==2 (#380)
Browse files Browse the repository at this point in the history
* Disable pip interop in CI

Fixes #381

Otherwise `conda` thinks it needs to upgrade the installed `kartothek` version. We otherwise only use conda packages in the CI and thus the best way is to tell conda not to touch any `pip`/`pypi` installed packages instead of guessing what to do with them. The problems in #380 didn't occur much earlier as `conda` always installed the latest release and that was mostly fine in CI.

* Test with pyarrow==2
  • Loading branch information
xhochy authored Dec 4, 2020
1 parent 901ca94 commit 3a3fa18
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
matrix:
numfocus_nightly: [false]
os: ["ubuntu-latest"]
pyarrow: ["0.17.1", "1.0.0", "nightly"]
pyarrow: ["0.17.1", "1.0.0", "2.0.0", "nightly"]
python: ["3.6", "3.7", "3.8"]
include:
- numfocus_nightly: true
Expand Down
5 changes: 5 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
Changelog
=========

Version 3.17.3 (2010-12-04)
===========================

* Allow ``pyarrow==2`` as a dependency.

Version 3.17.2 (2020-12-01)
===========================

Expand Down
4 changes: 2 additions & 2 deletions conda-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ msgpack-python>=0.5.2
# Currently dask and numpy==1.16.0 clash
numpy!=1.15.0,!=1.16.0
pandas>=0.23.0, !=1.0.0
pyarrow>=0.17.1, <2
pyarrow>=0.17.1, <3
simplejson
simplekv
storefact
Expand All @@ -15,4 +15,4 @@ zstandard
attrs
click
prompt-toolkit
pyyaml
pyyaml
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ msgpack>=0.5.2
# Currently dask and numpy==1.16.0 clash
numpy!=1.15.0,!=1.16.0
pandas>=0.23.0, !=1.0.0
pyarrow>=0.17.1, <2
pyarrow>=0.17.1, <3
simplejson
simplekv
storefact
Expand Down

0 comments on commit 3a3fa18

Please sign in to comment.