Skip to content

Switch deps to Conda #45641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ repos:
- flake8==4.0.1
- flake8-comprehensions==3.7.0
- flake8-bugbear==21.3.2
- pandas-dev-flaker==0.2.0
- pandas-dev-flaker==0.4.0
- repo: https://github.com/PyCQA/isort
rev: 5.10.1
hooks:
Expand Down
10 changes: 4 additions & 6 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,12 @@ dependencies:
# documentation
- gitpython # obtain contributors from git for whatsnew
- gitdb
- sphinx
- sphinx-panels
- numpydoc < 1.2 # 2021-02-09 1.2dev breaking CI
- pandas-dev-flaker=0.4.0
- pydata-sphinx-theme
- pytest-cython
- sphinx
- sphinx-panels
- types-python-dateutil
- types-PyMySQL
- types-pytz
Expand Down Expand Up @@ -78,7 +80,6 @@ dependencies:
- ipywidgets
- nbformat
- notebook>=6.0.3
- pip

# optional
- blosc
Expand Down Expand Up @@ -120,6 +121,3 @@ dependencies:
- pyreadstat # pandas.read_spss
- tabulate>=0.8.3 # DataFrame.to_markdown
- natsort # DataFrame.sort_values
- pip:
- pandas-dev-flaker==0.2.0
- pytest-cython
4 changes: 3 additions & 1 deletion pandas/io/formats/excel.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,9 @@ def __init__(
**kwargs,
):
if css_styles and css_converter:
css = ";".join(a + ":" + str(v) for (a, v) in css_styles[css_row, css_col])
css = ";".join(
[a + ":" + str(v) for (a, v) in css_styles[css_row, css_col]]
)
style = css_converter(css)

return super().__init__(row=row, col=col, val=val, style=style, **kwargs)
Expand Down
2 changes: 1 addition & 1 deletion pandas/io/json/_json.py
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ def _combine_lines(self, lines) -> str:
Combines a list of JSON objects into one JSON object.
"""
return (
f'[{",".join((line for line in (line.strip() for line in lines) if line))}]'
f'[{",".join([line for line in (line.strip() for line in lines) if line])}]'
)

def read(self):
Expand Down
8 changes: 4 additions & 4 deletions pandas/io/pytables.py
Original file line number Diff line number Diff line change
Expand Up @@ -2040,10 +2040,10 @@ def __repr__(self) -> str:
map(pprint_thing, (self.name, self.cname, self.axis, self.pos, self.kind))
)
return ",".join(
(
[
f"{key}->{value}"
for key, value in zip(["name", "cname", "axis", "pos", "kind"], temp)
)
]
)

def __eq__(self, other: Any) -> bool:
Expand Down Expand Up @@ -2341,10 +2341,10 @@ def __repr__(self) -> str:
)
)
return ",".join(
(
[
f"{key}->{value}"
for key, value in zip(["name", "cname", "dtype", "kind", "shape"], temp)
)
]
)

def __eq__(self, other: Any) -> bool:
Expand Down
9 changes: 4 additions & 5 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@ pycodestyle
pyupgrade
gitpython
gitdb
sphinx
sphinx-panels
numpydoc < 1.2
pandas-dev-flaker==0.4.0
pydata-sphinx-theme
pytest-cython
sphinx
sphinx-panels
types-python-dateutil
types-PyMySQL
types-pytz
Expand Down Expand Up @@ -52,7 +54,6 @@ statsmodels
ipywidgets
nbformat
notebook>=6.0.3
pip
blosc
bottleneck>=1.3.1
ipykernel
Expand Down Expand Up @@ -84,6 +85,4 @@ cftime
pyreadstat
tabulate>=0.8.3
natsort
pandas-dev-flaker==0.2.0
pytest-cython
setuptools>=51.0.0
6 changes: 3 additions & 3 deletions scripts/tests/test_sync_flake8_versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def test_get_revisions_no_failure(capsys):
{
"id": "flake8",
"additional_dependencies": [
"pandas-dev-flaker==0.2.0",
"pandas-dev-flaker==0.4.0",
"flake8-bugs==1.1.1",
],
}
Expand All @@ -101,7 +101,7 @@ def test_get_revisions_no_failure(capsys):
"id": "yesqa",
"additional_dependencies": [
"flake8==0.1.1",
"pandas-dev-flaker==0.2.0",
"pandas-dev-flaker==0.4.0",
"flake8-bugs==1.1.1",
],
}
Expand All @@ -116,7 +116,7 @@ def test_get_revisions_no_failure(capsys):
{
"pip": [
"git+https://github.com/pydata/pydata-sphinx-theme.git@master",
"pandas-dev-flaker==0.2.0",
"pandas-dev-flaker==0.4.0",
]
},
]
Expand Down
6 changes: 5 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,11 @@ ignore =
# tests use comparisons but not their returned value
B015,
# false positives
B301
B301,
# single-letter variables
PDF023
# "use 'pandas._testing' instead" in non-test code
PDF025
exclude =
doc/sphinxext/*.py,
doc/build/*.py,
Expand Down