From 54f891f39ef287fd2c3186c9117e203086630370 Mon Sep 17 00:00:00 2001 From: Jonas Haag Date: Wed, 8 Dec 2021 11:28:36 +0100 Subject: [PATCH 1/2] CI: Install more packages from conda-forge --- ci/deps/actions-38-db.yaml | 10 ++++------ ci/deps/actions-38-locale.yaml | 4 +--- ci/deps/actions-39-slow.yaml | 4 +--- ci/deps/actions-39.yaml | 4 +--- ci/deps/azure-macos-38.yaml | 4 ++-- ci/deps/azure-windows-39.yaml | 5 ++--- ci/deps/circle-38-arm64.yaml | 5 ++--- environment.yml | 10 +++++----- requirements-dev.txt | 10 +++++----- 9 files changed, 23 insertions(+), 33 deletions(-) diff --git a/ci/deps/actions-38-db.yaml b/ci/deps/actions-38-db.yaml index c08c642049b41..05b9eb8446af8 100644 --- 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 index d401aa6434dd1..b9157a1e74b1c 100644 --- 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 index cb54210e81f23..511ea8004af70 100644 --- 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 index dc897453114f1..81bc5a028e96c 100644 --- 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 index fe6fa6ca37e01..03de63fed4f9c 100644 --- a/ci/deps/azure-macos-38.yaml +++ b/ci/deps/azure-macos-38.yaml @@ -23,9 +23,11 @@ dependencies: - numpy=1.18.5 - openpyxl - pyarrow=1.0.1 + - pyreadstat - pytables - python-dateutil==2.8.1 - pytz + - pyxlsb - xarray - xlrd - xlsxwriter @@ -33,5 +35,3 @@ dependencies: - pip - pip: - cython>=0.29.24 - - pyreadstat - - pyxlsb diff --git a/ci/deps/azure-windows-39.yaml b/ci/deps/azure-windows-39.yaml index a0dde78c37261..3d8fe05e2fce5 100644 --- a/ci/deps/azure-windows-39.yaml +++ b/ci/deps/azure-windows-39.yaml @@ -36,6 +36,5 @@ dependencies: - xlsxwriter - xlwt - pyreadstat - - pip - - pip: - - pyxlsb + - pyxlsb + - zstandard diff --git a/ci/deps/circle-38-arm64.yaml b/ci/deps/circle-38-arm64.yaml index 6627ed5073b46..7f9aa75fb0e2e 100644 --- a/ci/deps/circle-38-arm64.yaml +++ b/ci/deps/circle-38-arm64.yaml @@ -15,7 +15,6 @@ dependencies: - numpy - python-dateutil - pytz - - pip + - zstandard - flask - - pip: - - moto + - moto diff --git a/environment.yml b/environment.yml index 30d05ab7700ff..2f24b1b05aef0 100644 --- 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 index 5673becbbe1cb..7db4fda986670 100644 --- 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 From 89d45f92b34b359a8f3e0427a5dccfe744a10fa4 Mon Sep 17 00:00:00 2001 From: Jonas Haag Date: Mon, 20 Dec 2021 09:44:27 +0100 Subject: [PATCH 2/2] Remove zstd --- ci/deps/azure-windows-39.yaml | 1 - ci/deps/circle-38-arm64.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/ci/deps/azure-windows-39.yaml b/ci/deps/azure-windows-39.yaml index 3d8fe05e2fce5..e582de42cc17f 100644 --- a/ci/deps/azure-windows-39.yaml +++ b/ci/deps/azure-windows-39.yaml @@ -37,4 +37,3 @@ dependencies: - xlwt - pyreadstat - pyxlsb - - zstandard diff --git a/ci/deps/circle-38-arm64.yaml b/ci/deps/circle-38-arm64.yaml index 7f9aa75fb0e2e..7912ce5f8a5fa 100644 --- a/ci/deps/circle-38-arm64.yaml +++ b/ci/deps/circle-38-arm64.yaml @@ -15,6 +15,5 @@ dependencies: - numpy - python-dateutil - pytz - - zstandard - flask - moto