Skip to content

CLN: Clean csv files in test data GH34427 #34458

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 7 commits into from
Jun 5, 2020
Merged

CLN: Clean csv files in test data GH34427 #34458

merged 7 commits into from
Jun 5, 2020

Conversation

najann
Copy link
Contributor

@najann najann commented May 29, 2020

I deleted the iris.csv and tips.csv files which are unused duplicates (i.e. those in pandas/tests/io/data/csv).

@WillAyd
Copy link
Member

WillAyd commented May 29, 2020

Thanks for the PR. Is it possible to do this the other way around? i.e. delete what's in tests/data and update the tests to make sure they point to tests/io/data/csv ?

@WillAyd WillAyd added the Clean label May 29, 2020
@jreback jreback added this to the 1.1 milestone May 29, 2020
@jreback jreback added the Testing pandas testing functions or related to the test suite label May 29, 2020
@jreback
Copy link
Contributor

jreback commented May 29, 2020

yeah agree here, let's remove the test/data ones

@najann
Copy link
Contributor Author

najann commented May 29, 2020

@WillAyd & @jreback the reason why I did it that way is that a couple of files in the documentation reference the csvs in tests/data:
Screenshot 2020-05-28 at 16 27 37

If you want to have the files in tests/data deleted & keep what's in tests/io/data/csv anyway, I can do that and change any references in the docs.

@jreback
Copy link
Contributor

jreback commented May 29, 2020

@najann yes we'd like to fix this in tests / docs.

@najann
Copy link
Contributor Author

najann commented May 31, 2020

@jreback there is also a tips.csv and iris.data file in doc/data... Should I clean that up & update any references (which exist only for iris.data), too?

@WillAyd
Copy link
Member

WillAyd commented Jun 1, 2020

I think OK to leave the doc ones alone for now

@WillAyd
Copy link
Member

WillAyd commented Jun 1, 2020

Actually made the above comment without realizing you already have to change some of the rst files; didn't realize they peered into the test folders like that

So I'm indifferent on that for now. I think this is good as is but can either fix all of the docs here or as a follow up.

I think test failure is unrelated; over to @jreback

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.

lgtm merge on green

@alimcmaster1
Copy link
Member

Re-running the failing travis job: https://travis-ci.org/github/pandas-dev/pandas/builds/692962783

@WillAyd
Copy link
Member

WillAyd commented Jun 5, 2020

Travis looks ok just hasn't updated status here

@WillAyd WillAyd merged commit ef8567d into pandas-dev:master Jun 5, 2020
@WillAyd
Copy link
Member

WillAyd commented Jun 5, 2020

Thanks @najann very nice clean up and first PR

@jorisvandenbossche jorisvandenbossche modified the milestones: 1.1, 1.0.5 Jun 9, 2020
@jorisvandenbossche
Copy link
Member

@meeseeksdev backport to 1.0.x

@lumberbot-app
Copy link

lumberbot-app bot commented Jun 9, 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.0.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 ef8567d0dc72ee54e21bbffe7b1c3f9ca5945909
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #34458: CLN: Clean csv files in test data GH34427'
  1. Push to a named branch :
git push YOURFORK 1.0.x:auto-backport-of-pr-34458-on-1.0.x
  1. Create a PR against branch 1.0.x, I would have named this PR:

"Backport PR #34458 on branch 1.0.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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Clean Testing pandas testing functions or related to the test suite
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CLN: is pandas/tests/data used?
6 participants