Repository: arrow Updated Branches: refs/heads/master d50f1525a -> fa8d27f31
ARROW-561:[JAVA][PYTHON] Update java & python dependencies to improve downstream packaging experience The current build for arrow uses a interesting work around for hamcrest conflict between JUNIT and mockito which results in mockito being in the compile scope. This is not suitable for some downstream users. Python setup file also leaves out test dependency (not overly important but useful for developers) & we can clarify parquet-cpp as an "extra" dependency for people requiring parquet support (already mentioned in the README file but good to have clarity in setup.py as well). Author: Holden Karau <hol...@us.ibm.com> Closes #342 from holdenk/ARROW-561-improve-deps and squashes the following commits: 5919b32 [Holden Karau] Drop extras_requires 938ed97 [Holden Karau] Mention test requires pytest and add an extra requires for parquet 283d6cd [Holden Karau] Remove mockito from compile scope and fix hamcrest issue with exclusion rule instead Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/fa8d27f3 Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/fa8d27f3 Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/fa8d27f3 Branch: refs/heads/master Commit: fa8d27f314b7c21c611d1c5caaa9b32ae0cb2b06 Parents: d50f152 Author: Holden Karau <hol...@us.ibm.com> Authored: Wed Feb 15 08:55:24 2017 -0500 Committer: Wes McKinney <wes.mckin...@twosigma.com> Committed: Wed Feb 15 08:55:24 2017 -0500 ---------------------------------------------------------------------- java/pom.xml | 10 ++++++++-- python/setup.py | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/arrow/blob/fa8d27f3/java/pom.xml ---------------------------------------------------------------------- diff --git a/java/pom.xml b/java/pom.xml index a147d66..e467cc1 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -442,11 +442,17 @@ <scope>test</scope> </dependency> <dependency> - <!-- Mockito needs to be on the class path after JUnit (or Hamcrest) as - long as Mockito _contains_ older Hamcrest classes. See arrow-2130. --> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <version>1.9.5</version> + <scope>test</scope> + <!-- Mockito contains old Hamcrest classes, causes issues with JUNIT --> + <exclusions> + <exclusion> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>ch.qos.logback</groupId> http://git-wip-us.apache.org/repos/asf/arrow/blob/fa8d27f3/python/setup.py ---------------------------------------------------------------------- diff --git a/python/setup.py b/python/setup.py index 5f5e5f3..54d1cd3 100644 --- a/python/setup.py +++ b/python/setup.py @@ -298,6 +298,7 @@ setup( use_scm_version = {"root": "..", "relative_to": __file__}, setup_requires=['setuptools_scm'], install_requires=['cython >= 0.23', 'numpy >= 1.9', 'six >= 1.0.0'], + test_requires=['pytest'], description="Python library for Apache Arrow", long_description=long_description, classifiers=[
