Attempt to fix arrow dependencies

(apache/arrow#2213)
mattwelborn · Oct 10, 2019 · 48709a9 · 48709a9
1 parent 8f6264c
commit 48709a9
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 6 deletions.
diff --git a/devtools/conda-envs/adapters.yaml b/devtools/conda-envs/adapters.yaml
@@ -21,11 +21,14 @@ dependencies:
   - tqdm
   - h5py
   - pyarrow
+  - arrow-cpp
+  - parquet-cpp
 
 # Test depends
   - pytest
   - pytest-cov
   - codecov
+  - requests-mock
 
 # Environment specific includes
   - rdkit

diff --git a/devtools/conda-envs/base.yaml b/devtools/conda-envs/base.yaml
@@ -21,11 +21,14 @@ dependencies:
   - tqdm
   - h5py
   - pyarrow
+  - arrow-cpp
+  - parquet-cpp
 
 # Test depends
   - pytest
   - pytest-cov
   - codecov
+  - requests-mock
 
 # QCArchive includes
   - qcengine>=0.11.0

diff --git a/devtools/conda-envs/dev_head.yaml b/devtools/conda-envs/dev_head.yaml
@@ -21,15 +21,17 @@ dependencies:
   - tqdm
   - h5py
   - pyarrow
+  - arrow-cpp
+  - parquet-cpp
 
 # Test depends
   - pytest
   - pytest-cov
   - codecov
+  - requests-mock
 
 # Environment specific includes
   - rdkit
-  - requests-mock
 
 # QCArchive includes
 

diff --git a/devtools/conda-envs/generate_envs.py b/devtools/conda-envs/generate_envs.py
@@ -32,11 +32,14 @@
   - tqdm
   - h5py
   - pyarrow
+  - arrow-cpp
+  - parquet-cpp
 
 # Test depends
   - pytest
   - pytest-cov
   - codecov
+  - requests-mock
 """
 qca_ecosystem_template = ["qcengine>=0.11.0", "qcelemental>=0.9.0"]
 
@@ -111,7 +114,7 @@ def generate_yaml(filename=None, channels=None, dependencies=None, pip_dependenc
         # Tests for the current development heads
         "filename":
         "dev_head.yaml",
-        "dependencies": ["rdkit", "requests-mock"],
+        "dependencies": ["rdkit"],
         "qca_ecosystem": [],
         "pip_dependencies": [
             "git+git://github.com/MolSSI/QCEngine#egg=qcengine",

diff --git a/devtools/conda-envs/openff.yaml b/devtools/conda-envs/openff.yaml
@@ -22,11 +22,14 @@ dependencies:
   - tqdm
   - h5py
   - pyarrow
+  - arrow-cpp
+  - parquet-cpp
 
 # Test depends
   - pytest
   - pytest-cov
   - codecov
+  - requests-mock
 
 # Environment specific includes
   - psi4>=1.3

diff --git a/setup.py b/setup.py
@@ -37,6 +37,8 @@
             'tqdm',
             'h5py',
             'pyarrow',
+            'arrow-cpp',
+            'parquet-cpp',
 
             # Database
             'sqlalchemy>=1.3',
@@ -65,10 +67,7 @@
                 'sphinx_rtd_theme',
                 'numpydoc',
             ],
-            'tests': [
-                'pytest',
-                'pytest-cov',
-            ],
+            'tests': ['pytest', 'pytest-cov', 'requests-mock'],
             'api_logging': [
                 'geoip2',
             ],