jazzband / tablib

Python Module for Tabular Datasets in XLS, CSV, JSON, YAML, &c.
https://tablib.readthedocs.io/
MIT License
4.61k stars 593 forks source link

Update documentation, elucidate the use of filters (and, or). #417

Closed xdanielsb closed 5 years ago

xdanielsb commented 5 years ago

Hi,

Concerning the issue #251 that I closed some minutes ago, I update the docs to clarify the usage of filters to generate filters type (or, and).

Regards,

codecov[bot] commented 5 years ago

Codecov Report

Merging #417 into master will increase coverage by 0.09%. The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #417      +/-   ##
==========================================
+ Coverage   88.48%   88.57%   +0.09%     
==========================================
  Files          24       24              
  Lines        2371     2390      +19     
==========================================
+ Hits         2098     2117      +19     
  Misses        273      273
Impacted Files Coverage Δ
src/tablib/core.py 81.64% <0%> (+0.74%) :arrow_up:

Continue to review full report at Codecov.

Legend - Click here to learn more Δ = absolute <relative> (impact), ø = not affected, ? = missing data Powered by Codecov. Last update 51a720b...34fe723. Read the comment docs.

claudep commented 5 years ago

Thanks for the patch! If you commit the patch yourself, may I ask you to squash commits before (either manually or by choosing Squash and commit button)? It would be great if you could also reference the issue number in the commit message.

xdanielsb commented 5 years ago

sorry @claudep I made a mistake I did the squash and commit, and push to the wrong branch 'master', I did the rebase in the branch master to try to solve this problem, is there any way to solve that without doing a pull request again? I dont know if you can do the rebase the new commit name that I did was : "Elucidate the use of filters (and, or), this closes issue #251."

claudep commented 5 years ago

The commit is done, so no need to do anything else. Just for the next time, try to squash or just use the "Squash" merge button :-)

xdanielsb commented 5 years ago

thanks @claudep, sorry for that nuissance commit

hugovk commented 5 years ago

To be on the safe side, shall we protect master from direct commits?

https://help.github.com/en/github/administering-a-repository/configuring-protected-branches

claudep commented 5 years ago

We could do that, but I don't have access to repo settings.

hugovk commented 5 years ago

@jezdez Please could you protect the master branch for this project?

jezdez commented 5 years ago

@hugovk Done. I've only enabled the general protection against force-pushes etc. Do you want me to enable other protections?

Screenshot_2019-10-30 jazzband tablib

jezdez commented 5 years ago

Oh, and I also disabled the "merge commit" merge option for the repo, so that only rebase and squash commits are allowed:

Screenshot_2019-10-30 jazzband tablib(1)

claudep commented 5 years ago

@jezdez Thanks!

hugovk commented 5 years ago

Looks good, thanks!