Skip to content

Commit a63db3d

Browse files
authored
Remove dependencies to Conda (pandas-dev#45641)
1 parent 047137c commit a63db3d

File tree

8 files changed

+25
-22
lines changed

8 files changed

+25
-22
lines changed

.pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ repos:
5050
- flake8==4.0.1
5151
- flake8-comprehensions==3.7.0
5252
- flake8-bugbear==21.3.2
53-
- pandas-dev-flaker==0.2.0
53+
- pandas-dev-flaker==0.4.0
5454
- repo: https://github.com/PyCQA/isort
5555
rev: 5.10.1
5656
hooks:

environment.yml

+4-6
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,12 @@ dependencies:
3232
# documentation
3333
- gitpython # obtain contributors from git for whatsnew
3434
- gitdb
35-
- sphinx
36-
- sphinx-panels
3735
- numpydoc < 1.2 # 2021-02-09 1.2dev breaking CI
36+
- pandas-dev-flaker=0.4.0
3837
- pydata-sphinx-theme
38+
- pytest-cython
39+
- sphinx
40+
- sphinx-panels
3941
- types-python-dateutil
4042
- types-PyMySQL
4143
- types-pytz
@@ -78,7 +80,6 @@ dependencies:
7880
- ipywidgets
7981
- nbformat
8082
- notebook>=6.0.3
81-
- pip
8283

8384
# optional
8485
- blosc
@@ -120,6 +121,3 @@ dependencies:
120121
- pyreadstat # pandas.read_spss
121122
- tabulate>=0.8.3 # DataFrame.to_markdown
122123
- natsort # DataFrame.sort_values
123-
- pip:
124-
- pandas-dev-flaker==0.2.0
125-
- pytest-cython

pandas/io/formats/excel.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,9 @@ def __init__(
8585
**kwargs,
8686
):
8787
if css_styles and css_converter:
88-
css = ";".join(a + ":" + str(v) for (a, v) in css_styles[css_row, css_col])
88+
css = ";".join(
89+
[a + ":" + str(v) for (a, v) in css_styles[css_row, css_col]]
90+
)
8991
style = css_converter(css)
9092

9193
return super().__init__(row=row, col=col, val=val, style=style, **kwargs)

pandas/io/json/_json.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@ def _combine_lines(self, lines) -> str:
724724
Combines a list of JSON objects into one JSON object.
725725
"""
726726
return (
727-
f'[{",".join((line for line in (line.strip() for line in lines) if line))}]'
727+
f'[{",".join([line for line in (line.strip() for line in lines) if line])}]'
728728
)
729729

730730
def read(self):

pandas/io/pytables.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -2040,10 +2040,10 @@ def __repr__(self) -> str:
20402040
map(pprint_thing, (self.name, self.cname, self.axis, self.pos, self.kind))
20412041
)
20422042
return ",".join(
2043-
(
2043+
[
20442044
f"{key}->{value}"
20452045
for key, value in zip(["name", "cname", "axis", "pos", "kind"], temp)
2046-
)
2046+
]
20472047
)
20482048

20492049
def __eq__(self, other: Any) -> bool:
@@ -2341,10 +2341,10 @@ def __repr__(self) -> str:
23412341
)
23422342
)
23432343
return ",".join(
2344-
(
2344+
[
23452345
f"{key}->{value}"
23462346
for key, value in zip(["name", "cname", "dtype", "kind", "shape"], temp)
2347-
)
2347+
]
23482348
)
23492349

23502350
def __eq__(self, other: Any) -> bool:

requirements-dev.txt

+4-5
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@ pycodestyle
1818
pyupgrade
1919
gitpython
2020
gitdb
21-
sphinx
22-
sphinx-panels
2321
numpydoc < 1.2
22+
pandas-dev-flaker==0.4.0
2423
pydata-sphinx-theme
24+
pytest-cython
25+
sphinx
26+
sphinx-panels
2527
types-python-dateutil
2628
types-PyMySQL
2729
types-pytz
@@ -52,7 +54,6 @@ statsmodels
5254
ipywidgets
5355
nbformat
5456
notebook>=6.0.3
55-
pip
5657
blosc
5758
bottleneck>=1.3.1
5859
ipykernel
@@ -84,6 +85,4 @@ cftime
8485
pyreadstat
8586
tabulate>=0.8.3
8687
natsort
87-
pandas-dev-flaker==0.2.0
88-
pytest-cython
8988
setuptools>=51.0.0

scripts/tests/test_sync_flake8_versions.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def test_get_revisions_no_failure(capsys):
8787
{
8888
"id": "flake8",
8989
"additional_dependencies": [
90-
"pandas-dev-flaker==0.2.0",
90+
"pandas-dev-flaker==0.4.0",
9191
"flake8-bugs==1.1.1",
9292
],
9393
}
@@ -101,7 +101,7 @@ def test_get_revisions_no_failure(capsys):
101101
"id": "yesqa",
102102
"additional_dependencies": [
103103
"flake8==0.1.1",
104-
"pandas-dev-flaker==0.2.0",
104+
"pandas-dev-flaker==0.4.0",
105105
"flake8-bugs==1.1.1",
106106
],
107107
}
@@ -116,7 +116,7 @@ def test_get_revisions_no_failure(capsys):
116116
{
117117
"pip": [
118118
"git+https://github.com/pydata/pydata-sphinx-theme.git@master",
119-
"pandas-dev-flaker==0.2.0",
119+
"pandas-dev-flaker==0.4.0",
120120
]
121121
},
122122
]

setup.cfg

+5-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,11 @@ ignore =
103103
# tests use comparisons but not their returned value
104104
B015,
105105
# false positives
106-
B301
106+
B301,
107+
# single-letter variables
108+
PDF023
109+
# "use 'pandas._testing' instead" in non-test code
110+
PDF025
107111
exclude =
108112
doc/sphinxext/*.py,
109113
doc/build/*.py,

0 commit comments

Comments
 (0)