From 54d19c414a3f17f5a8a19aae35cb897e8ff1f59d Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Thu, 12 Sep 2019 10:34:28 +0200 Subject: [PATCH 1/2] TMP: pin openssl for doc build --- environment.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/environment.yml b/environment.yml index d72972ffc4da4..b0ee9a816b7e2 100644 --- a/environment.yml +++ b/environment.yml @@ -82,3 +82,7 @@ dependencies: - xlwt # pandas.read_excel, DataFrame.to_excel, pandas.ExcelWriter, pandas.ExcelFile - odfpy # pandas.read_excel - pyreadstat # pandas.read_spss + + # temporarily pin openssl + # https://github.com/pandas-dev/pandas/issues/28402 + - openssl=1.1.1c From c4888925c01ddb9825da9725b2e7cb1cf3b3cf1d Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Thu, 12 Sep 2019 11:03:38 +0200 Subject: [PATCH 2/2] linting --- environment.yml | 2 +- scripts/generate_pip_deps_from_conda.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index b0ee9a816b7e2..ade0bb8f7fa3a 100644 --- a/environment.yml +++ b/environment.yml @@ -85,4 +85,4 @@ dependencies: # temporarily pin openssl # https://github.com/pandas-dev/pandas/issues/28402 - - openssl=1.1.1c + - openssl=1.1.1c diff --git a/scripts/generate_pip_deps_from_conda.py b/scripts/generate_pip_deps_from_conda.py index 29fe8bf84c12b..7a4bc4abd436b 100755 --- a/scripts/generate_pip_deps_from_conda.py +++ b/scripts/generate_pip_deps_from_conda.py @@ -19,7 +19,7 @@ import yaml -EXCLUDE = {"python=3"} +EXCLUDE = {"python=3", "openssl=1.1.1c"} RENAME = {"pytables": "tables", "pyqt": "pyqt5"}