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

BUG: shows correct package name when import_optional_dependency is ca… #36134

Merged
merged 5 commits into from
Sep 7, 2020

Conversation

hs2361
Copy link
Contributor

@hs2361 hs2361 commented Sep 5, 2020

…lled. fixes #35948

Copy link
Contributor

@jreback jreback left a comment

Choose a reason for hiding this comment

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

can you add a note in whatsnew 1.1.2 Other bug fix section is fine

pandas/compat/_optional.py Show resolved Hide resolved
@jreback jreback added Build Library building on various platforms Error Reporting Incorrect or improved errors from pandas IO Excel read_excel, to_excel labels Sep 5, 2020
@jreback jreback added this to the 1.1.2 milestone Sep 5, 2020
@jreback
Copy link
Contributor

jreback commented Sep 5, 2020

lgtm ping on green

@hs2361
Copy link
Contributor Author

hs2361 commented Sep 6, 2020

@jreback All checks are green!

@hs2361
Copy link
Contributor Author

hs2361 commented Sep 6, 2020

@jreback Could you please help me to figure out why the Travis CI build is failing? The test that seems to be failing is pandas/tests/io/test_gcs.py::test_to_csv_compression_encoding_gcs, but due to an assertion error unrelated to my commit. This test was added in via commit 361166f

@simonjayhawkins
Copy link
Member

I've restarted travis to see if failure persists.

@simonjayhawkins
Copy link
Member

will be merging and backporting if green

@hs2361
Copy link
Contributor Author

hs2361 commented Sep 7, 2020

@simonjayhawkins The Travis CI build passed this time. Thanks for your help.

@simonjayhawkins simonjayhawkins merged commit b9a9769 into pandas-dev:master Sep 7, 2020
@simonjayhawkins
Copy link
Member

Thanks @hs2361

@simonjayhawkins
Copy link
Member

@meeseeksdev backport 1.1.x

@lumberbot-app
Copy link

lumberbot-app bot commented Sep 7, 2020

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout 1.1.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 b9a97691de3e85771d84e786ff40351260a5cfcc
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #36134: BUG: shows correct package name when import_optional_dependency is ca…'
  1. Push to a named branch :
git push YOURFORK 1.1.x:auto-backport-of-pr-36134-on-1.1.x
  1. Create a PR against branch 1.1.x, I would have named this PR:

"Backport PR #36134 on branch 1.1.x"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

@simonjayhawkins
Copy link
Member

maybe due to release notes out of sync #35831 (comment)

i'll resolve that and then see if the backport can be triggered a second time.

@simonjayhawkins
Copy link
Member

@meeseeksdev backport 1.1.x

1 similar comment
@simonjayhawkins
Copy link
Member

@meeseeksdev backport 1.1.x

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Build Library building on various platforms Error Reporting Incorrect or improved errors from pandas IO Excel read_excel, to_excel
Projects
None yet
Development

Successfully merging this pull request may close these issues.

DOC: "engine=odf" option should ask you to install pyodf instead of odf in pandas.read_excel
3 participants