Skip to content

Commit 3029d8f

Browse files
jbrockmendeljreback
authored andcommitted
CI: clean environment.yml, comment that req-dev is generated (#30392)
1 parent 60eab98 commit 3029d8f

File tree

3 files changed

+35
-18
lines changed

3 files changed

+35
-18
lines changed

environment.yml

+19-10
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ dependencies:
3333
- nbconvert>=5.4.1
3434
- nbsphinx
3535
- pandoc
36-
# Dask and its dependencies
36+
37+
# Dask and its dependencies (that dont install with dask)
3738
- dask-core
3839
- toolz>=0.7.3
3940
- fsspec>=0.5.1
@@ -54,6 +55,8 @@ dependencies:
5455
- pytest>=5.0.1
5556
- pytest-cov
5657
- pytest-xdist>=1.21
58+
59+
# downstream tests
5760
- seaborn
5861
- statsmodels
5962

@@ -74,22 +77,28 @@ dependencies:
7477
- scipy>=1.1
7578

7679
# optional for io
77-
- beautifulsoup4>=4.6.0 # pandas.read_html
80+
# ---------------
81+
# pd.read_html
82+
- beautifulsoup4>=4.6.0
83+
- html5lib
84+
- lxml
85+
86+
# pd.read_excel, DataFrame.to_excel, pd.ExcelWriter, pd.ExcelFile
87+
- openpyxl<=3.0.1
88+
- xlrd
89+
- xlsxwriter
90+
- xlwt
91+
- odfpy
92+
7893
- fastparquet>=0.3.2 # pandas.read_parquet, DataFrame.to_parquet
79-
- html5lib # pandas.read_html
80-
- lxml # pandas.read_html
81-
- openpyxl<=3.0.1 # pandas.read_excel, DataFrame.to_excel, pandas.ExcelWriter, pandas.ExcelFile
8294
- pyarrow>=0.13.1 # pandas.read_parquet, DataFrame.to_parquet, pandas.read_feather, DataFrame.to_feather
95+
- python-snappy # required by pyarrow
96+
8397
- pyqt>=5.9.2 # pandas.read_clipboard
8498
- pytables>=3.4.2 # pandas.read_hdf, DataFrame.to_hdf
85-
- python-snappy # required by pyarrow
8699
- s3fs # pandas.read_csv... when using 's3://...' path
87100
- sqlalchemy # pandas.read_sql, DataFrame.to_sql
88101
- xarray # DataFrame.to_xarray
89-
- xlrd # pandas.read_excel, DataFrame.to_excel, pandas.ExcelWriter, pandas.ExcelFile
90-
- xlsxwriter # pandas.read_excel, DataFrame.to_excel, pandas.ExcelWriter, pandas.ExcelFile
91-
- xlwt # pandas.read_excel, DataFrame.to_excel, pandas.ExcelWriter, pandas.ExcelFile
92-
- odfpy # pandas.read_excel
93102
- pyreadstat # pandas.read_spss
94103
- pip:
95104
- git+https://github.com/pandas-dev/pandas-sphinx-theme.git@master

requirements-dev.txt

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# This file is auto-generated from environment.yml, do not modify.
2+
# See that file for comments about the need/usage of each depdendency.
3+
14
numpy>=1.15
25
python-dateutil>=2.6.1
36
pytz
@@ -48,20 +51,20 @@ matplotlib>=2.2.2
4851
numexpr>=2.6.8
4952
scipy>=1.1
5053
beautifulsoup4>=4.6.0
51-
fastparquet>=0.3.2
5254
html5lib
5355
lxml
5456
openpyxl<=3.0.1
57+
xlrd
58+
xlsxwriter
59+
xlwt
60+
odfpy
61+
fastparquet>=0.3.2
5562
pyarrow>=0.13.1
63+
python-snappy
5664
pyqt5>=5.9.2
5765
tables>=3.4.2
58-
python-snappy
5966
s3fs
6067
sqlalchemy
6168
xarray
62-
xlrd
63-
xlsxwriter
64-
xlwt
65-
odfpy
6669
pyreadstat
6770
git+https://github.com/pandas-dev/pandas-sphinx-theme.git@master

scripts/generate_pip_deps_from_conda.py

+7-2
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,14 @@ def main(conda_fname, pip_fname, compare=False):
8787
elif isinstance(dep, dict) and len(dep) == 1 and "pip" in dep:
8888
pip_deps += dep["pip"]
8989
else:
90-
raise ValueError("Unexpected dependency {}".format(dep))
90+
raise ValueError(f"Unexpected dependency {dep}")
9191

92-
pip_content = "\n".join(pip_deps)
92+
fname = os.path.split(conda_fname)[1]
93+
header = (
94+
f"# This file is auto-generated from {fname}, do not modify.\n"
95+
"# See that file for comments about the need/usage of each depdendency.\n\n"
96+
)
97+
pip_content = header + "\n".join(pip_deps)
9398

9499
if compare:
95100
with open(pip_fname) as pip_fd:

0 commit comments

Comments
 (0)