From 20bb4769fc25059bc2ef002304befa19c88c80ae Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Thu, 12 Sep 2019 11:54:54 +0200 Subject: [PATCH] Revert "TMP: pin openssl for doc build (#28404)" This reverts commit 094fb120e3a79d577ca368247f789db41d327f7c. --- environment.yml | 4 ---- scripts/generate_pip_deps_from_conda.py | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/environment.yml b/environment.yml index ade0bb8f7fa3a..d72972ffc4da4 100644 --- a/environment.yml +++ b/environment.yml @@ -82,7 +82,3 @@ 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 diff --git a/scripts/generate_pip_deps_from_conda.py b/scripts/generate_pip_deps_from_conda.py index 7a4bc4abd436b..29fe8bf84c12b 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", "openssl=1.1.1c"} +EXCLUDE = {"python=3"} RENAME = {"pytables": "tables", "pyqt": "pyqt5"}