Skip to content
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

STY: fstrings in io.pytables #29758

Merged
merged 3 commits into from
Nov 23, 2019

Conversation

jbrockmendel
Copy link
Member

honestly not sure why ive got such a bee in my bonnet about this file

@@ -1931,8 +1910,7 @@ def validate_attr(self, append: bool):
existing_kind = getattr(self.attrs, self.kind_attr, None)
if existing_kind is not None and existing_kind != self.kind:
raise TypeError(
"incompatible kind in col [{existing} - "
"{self_kind}]".format(existing=existing_kind, self_kind=self.kind)
f"incompatible kind in col [{existing_kind} - " f"{self.kind}]"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

concatenate

@@ -4012,8 +3961,7 @@ def process_filter(field, filt):
return obj.loc(axis=axis_number)[takers]

raise ValueError(
"cannot find the field [{field}] for "
"filtering!".format(field=field)
f"cannot find the field [{field}] for " "filtering!"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

concatenate

Copy link
Member

@simonjayhawkins simonjayhawkins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jbrockmendel minor nits otherwise lgtm

@simonjayhawkins simonjayhawkins added this to the 1.0 milestone Nov 21, 2019
@simonjayhawkins simonjayhawkins added the Code Style Code style, linting, code_checks label Nov 21, 2019
@jreback
Copy link
Contributor

jreback commented Nov 22, 2019

can you rebase

@jbrockmendel
Copy link
Member Author

rebased+green

@WillAyd WillAyd merged commit cf202be into pandas-dev:master Nov 23, 2019
@WillAyd
Copy link
Member

WillAyd commented Nov 23, 2019

Thanks @jbrockmendel

@jbrockmendel jbrockmendel deleted the cln-pytables-fstrings branch November 23, 2019 23:33
keechongtan added a commit to keechongtan/pandas that referenced this pull request Nov 25, 2019
…ndexing-1row-df

* upstream/master: (185 commits)
  ENH: add BooleanArray extension array (pandas-dev#29555)
  DOC: Add link to dev calendar and meeting notes (pandas-dev#29737)
  ENH: Add built-in function for Styler to format the text displayed for missing values (pandas-dev#29118)
  DEPR: remove statsmodels/seaborn compat shims (pandas-dev#29822)
  DEPR: remove Index.summary (pandas-dev#29807)
  DEPR: passing an int to read_excel use_cols (pandas-dev#29795)
  STY: fstrings in io.pytables (pandas-dev#29758)
  BUG: Fix melt with mixed int/str columns (pandas-dev#29792)
  TST: add test for ffill/bfill for non unique multilevel (pandas-dev#29763)
  Changed description of parse_dates in read_excel(). (pandas-dev#29796)
  BUG: pivot_table not returning correct type when margin=True and aggfunc='mean'  (pandas-dev#28248)
  REF: Create _lib/window directory (pandas-dev#29817)
  Fixed small mistake (pandas-dev#29815)
  minor cleanups (pandas-dev#29798)
  DEPR: enforce deprecations in core.internals (pandas-dev#29723)
  add test for unused level raises KeyError (pandas-dev#29760)
  Add documentation linking to sqlalchemy (pandas-dev#29373)
  io/parsers: ensure decimal is str on PythonParser (pandas-dev#29743)
  Reenabled no-unused-function (pandas-dev#29767)
  CLN:F-string in pandas/_libs/tslibs/*.pyx (pandas-dev#29775)
  ...

# Conflicts:
#	pandas/tests/frame/indexing/test_indexing.py
proost pushed a commit to proost/pandas that referenced this pull request Dec 19, 2019
proost pushed a commit to proost/pandas that referenced this pull request Dec 19, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code Style Code style, linting, code_checks
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants