CI: Install more packages from conda-forge (pandas-dev#44817)

me-kbs · Dec 22, 2021 · dd018ac · dd018ac
1 parent 9138b1d
commit dd018ac
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 33 deletions.
diff --git a/ci/deps/actions-38-db.yaml b/ci/deps/actions-38-db.yaml
@@ -45,9 +45,7 @@ dependencies:
   - xlrd
   - xlsxwriter
   - xlwt
-  - pip
-  - pip:
-    - brotlipy
-    - coverage
-    - pandas-datareader
-    - pyxlsb
+  - brotlipy
+  - coverage
+  - pandas-datareader
+  - pyxlsb
diff --git a/ci/deps/actions-38-locale.yaml b/ci/deps/actions-38-locale.yaml
@@ -33,6 +33,4 @@ dependencies:
   - xlsxwriter
   - xlwt
   - pyarrow=1.0.1
-  - pip
-  - pip:
-    - pyxlsb
+  - pyxlsb
diff --git a/ci/deps/actions-39-slow.yaml b/ci/deps/actions-39-slow.yaml
@@ -37,6 +37,4 @@ dependencies:
   - xlsxwriter
   - xlwt
   - pyreadstat
-  - pip
-  - pip:
-    - pyxlsb
+  - pyxlsb
diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml
@@ -36,6 +36,4 @@ dependencies:
   - xlsxwriter
   - xlwt
   - pyreadstat
-  - pip
-  - pip:
-    - pyxlsb
+  - pyxlsb
diff --git a/ci/deps/azure-macos-38.yaml b/ci/deps/azure-macos-38.yaml
@@ -23,15 +23,15 @@ dependencies:
   - numpy=1.18.5
   - openpyxl
   - pyarrow=1.0.1
+  - pyreadstat
   - pytables
   - python-dateutil==2.8.1
   - pytz
+  - pyxlsb
   - xarray
   - xlrd
   - xlsxwriter
   - xlwt
   - pip
   - pip:
     - cython>=0.29.24
-    - pyreadstat
-    - pyxlsb
diff --git a/ci/deps/azure-windows-39.yaml b/ci/deps/azure-windows-39.yaml
@@ -36,6 +36,4 @@ dependencies:
   - xlsxwriter
   - xlwt
   - pyreadstat
-  - pip
-  - pip:
-    - pyxlsb
+  - pyxlsb
diff --git a/ci/deps/circle-38-arm64.yaml b/ci/deps/circle-38-arm64.yaml
@@ -15,7 +15,5 @@ dependencies:
   - numpy
   - python-dateutil
   - pytz
-  - pip
   - flask
-  - pip:
-    - moto
+  - moto
diff --git a/environment.yml b/environment.yml
@@ -34,6 +34,11 @@ dependencies:
   - gitdb
   - sphinx
   - sphinx-panels
+  - numpydoc < 1.2  # 2021-02-09 1.2dev breaking CI
+  - types-python-dateutil
+  - types-PyMySQL
+  - types-pytz
+  - types-setuptools
 
   # documentation (jupyter notebooks)
   - nbconvert>=5.4.1
@@ -116,10 +121,5 @@ dependencies:
   - natsort  # DataFrame.sort_values
   - pip:
     - git+https://github.com/pydata/pydata-sphinx-theme.git@master
-    - numpydoc < 1.2  # 2021-02-09 1.2dev breaking CI
     - pandas-dev-flaker==0.2.0
-    - types-python-dateutil
-    - types-PyMySQL
-    - types-pytz
-    - types-setuptools
     - pytest-cython
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -20,6 +20,11 @@ gitpython
 gitdb
 sphinx
 sphinx-panels
+numpydoc < 1.2
+types-python-dateutil
+types-PyMySQL
+types-pytz
+types-setuptools
 nbconvert>=5.4.1
 nbsphinx
 pandoc
@@ -79,11 +84,6 @@ pyreadstat
 tabulate>=0.8.3
 natsort
 git+https://github.com/pydata/pydata-sphinx-theme.git@master
-numpydoc < 1.2
 pandas-dev-flaker==0.2.0
-types-python-dateutil
-types-PyMySQL
-types-pytz
-types-setuptools
 pytest-cython
 setuptools>=51.0.0
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,6 +33,4 @@ dependencies: @@
       - xlsxwriter
       - xlwt
       - pyarrow=1.0.1
-      - pip
-      - pip:
-        - pyxlsb
+      - pyxlsb