From f4a024898604786d05995d574f4a100dfd2c3d3b Mon Sep 17 00:00:00 2001 From: Vinayak Mehta Date: Fri, 14 Sep 2018 09:49:06 +0530 Subject: [PATCH 1/9] Add alternate install instructions --- README.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/README.md b/README.md index 89f8a17..46be8a0 100644 --- a/README.md +++ b/README.md @@ -56,6 +56,23 @@ After [installing the dependencies](), you can simply use pip to install Camelot $ pip install camelot-py +### Alternatively + +You can install the dependencies [tk](https://www.tcl.tk/) and [ghostscript](https://www.ghostscript.com/) using your system's package manager. After that, clone the repo using: + +
+$ git clone https://www.github.com/socialcopsdev/camelot
+
+ +and install Camelot using pip: + +
+$ cd camelot
+$ pip install .
+
+ +Note: Use a [virtualenv](https://virtualenv.pypa.io/en/stable/) if you don't want to affect your global Python installation. + ## Documentation Great documentation is available at [insert link](). From 96381eb8e2b80295d8daff8b185bb884a505c50b Mon Sep 17 00:00:00 2001 From: Vinayak Mehta Date: Fri, 14 Sep 2018 09:52:23 +0530 Subject: [PATCH 2/9] Remove typo --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 20940fd..aa9f1b9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Contributor's Guide -If you're reading this, you're probably looking to contributing to Camelot. *Time is the only real currency*, and the fact that you're considering spending some here is *very* generous of you. Thanks you very much! +If you're reading this, you're probably looking to contributing to Camelot. *Time is the only real currency*, and the fact that you're considering spending some here is *very* generous of you. Thank you very much! This document will help you get started with contributing documentation, code, testing and filing issues. If you have any questions, feel free to reach out to [Vinayak Mehta](http://vinayak-mehta.github.io), the author and maintainer. @@ -122,4 +122,4 @@ import camelot; print('Camelot', camelot.__version__) - Make sure you include **steps to reproduce the bug**, using code snippets. See [Creating and highlighting code blocks](https://help.github.com/articles/creating-and-highlighting-code-blocks/). -- Also include a link to the PDF document that you were trying to extract tables from, telling us what you expected the code to do and what actually happened. \ No newline at end of file +- Also include a link to the PDF document that you were trying to extract tables from, telling us what you expected the code to do and what actually happened. From ddff66f20483b1b0e8b570dd690259262364cb66 Mon Sep 17 00:00:00 2001 From: Vinayak Mehta Date: Fri, 14 Sep 2018 09:53:45 +0530 Subject: [PATCH 3/9] Fix quote --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index aa9f1b9..1fb6b8c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,7 +8,7 @@ This document will help you get started with contributing documentation, code, t The following quote sums up the **Code Of Conduct**. - **Be cordial or be on your way**. *--Kenneth Reitz* + > Be cordial or be on your way. --Kenneth Reitz Kenneth Reitz has also written an [essay](https://www.kennethreitz.org/essays/be-cordial-or-be-on-your-way) on this topic, which you should read. From f5a748e57f75b1a4af9282b78723fc05a0703746 Mon Sep 17 00:00:00 2001 From: Vinayak Mehta Date: Fri, 14 Sep 2018 09:55:22 +0530 Subject: [PATCH 4/9] Add alternate install instructions --- CONTRIBUTING.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1fb6b8c..c560643 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -26,6 +26,14 @@ To install the dependencies needed for development, you can use pip: $ pip install camelot-py[dev] +### Alternativly + +You can clone the project repository, and install using pip: + +
+$ pip install .[dev]
+
+ ## Pull Requests ### Submit a Pull Request From d294ddbf0360a8415ce8f6f1c3cfe2b95ab49956 Mon Sep 17 00:00:00 2001 From: Vinayak Mehta Date: Fri, 14 Sep 2018 10:01:30 +0530 Subject: [PATCH 5/9] Update CONTRIBUTING.md --- CONTRIBUTING.md | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c560643..3f2438d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -42,7 +42,7 @@ The preferred workflow for contributing to Camelot is to fork the [project repos 1. Fork the project repository: click on the ‘Fork’ button near the top of the page. This creates a copy of the code under your account on the GitHub. -2. Clone your fork of the Camelot from your GitHub account: +2. Clone your fork of Camelot from your GitHub account: 
 $ git clone https://www.github.com/[username]/camelot
@@ -71,7 +71,7 @@ $ git commit
 $ git push -u origin my-feature
-Now it's time to go to the your fork of Camelot and create a pull request! You can [follow these instructions](https://help.github.com/articles/creating-a-pull-request-from-a-fork/) to do the same. +Now it's time to go to the your fork of Camelot and create a pull request! You can [follow these instructions](https://help.github.com/articles/creating-a-pull-request-from-a-fork/) to do this. ### Work on your Pull Request @@ -90,7 +90,7 @@ We recommend that your pull request complies with the following rules: - Wrap the body at 72 characters - Use the body to explain what and why vs. how -- Please prefix your title of your pull request with [MRG] (Ready for Merge), if the contribution is complete and ready for a detailed review. An incomplete pull request's title should be prefixed with [WIP] (to indicate a work in progress), and changed to [MRG] when it's complete. A good [task list](https://blog.github.com/2013-01-09-task-lists-in-gfm-issues-pulls-comments/) in the PR description will ensure that other people will get a better idea of what it proposes to do, which will also increase collaboration. +- Please prefix the title of your pull request with [MRG] (Ready for Merge), if the contribution is complete and ready for a detailed review. An incomplete pull request's title should be prefixed with [WIP] (to indicate a work in progress), and changed to [MRG] when it's complete. A good [task list](https://blog.github.com/2013-01-09-task-lists-in-gfm-issues-pulls-comments/) in the PR description will ensure that other people get a better idea of what it proposes to do, which will also increase collaboration. - If contributing new functionality, make sure that you add a unit test for it, while making sure that all previous tests pass. Camelot uses [pytest](https://docs.pytest.org/en/latest/) for testing. Tests can be run using: @@ -100,11 +100,11 @@ $ python setup.py test ## Writing Documentation -Writing documentation, function docstrings, examples and tutorials is a great way to start contributing to open-source software! The documentation is present inside the `docs/` directory of the source code repository. +Writing documentation, function docstrings, examples and tutorials is a great way to start contributing to open-source software! The documentation is present inside the `docs/` directory of the project repository. -The documentation is written in [reStructuredText](https://en.wikipedia.org/wiki/ReStructuredText), with [Sphinx](http://www.sphinx-doc.org/en/master/) used to generate these lovely HTML files that you're currently reading (unless you're reading this on GitHub). You can edit the documentation using any text editor and then generate the HTML output by running `make html` in the `docs/` directory. +It is written in [reStructuredText](https://en.wikipedia.org/wiki/ReStructuredText), with [Sphinx](http://www.sphinx-doc.org/en/master/) used to generate these lovely HTML files that you're currently reading (unless you're reading this on GitHub). You can edit the documentation using any text editor and then generate the HTML output by running `make html` in the `docs/` directory. -The function docstrings are written using the [numpydoc](https://numpydoc.readthedocs.io/en/latest/format.html) extension for Sphinx. Make sure you check it out before you start writing one. +The function docstrings are written using the [numpydoc](https://numpydoc.readthedocs.io/en/latest/format.html) extension for Sphinx. Make sure you check out its format guidelines, before you start writing one. ## Filing Issues @@ -126,8 +126,7 @@ import cv2; print('OpenCV', cv2.__version__) import camelot; print('Camelot', camelot.__version__) -- Please include the **complete traceback** in your bug report. - -- Make sure you include **steps to reproduce the bug**, using code snippets. See [Creating and highlighting code blocks](https://help.github.com/articles/creating-and-highlighting-code-blocks/). - -- Also include a link to the PDF document that you were trying to extract tables from, telling us what you expected the code to do and what actually happened. +- Make sure you include: + - **Complete traceback** in your bug report. + - **Steps to reproduce the bug**, using code snippets. See [Creating and highlighting code blocks](https://help.github.com/articles/creating-and-highlighting-code-blocks/). + - A link to the PDF document that you were trying to extract tables from, telling us what you expected the code to do and what actually happened. From f14961481536bc2fff1189045456b92b9ef6f959 Mon Sep 17 00:00:00 2001 From: Vinayak Mehta Date: Fri, 14 Sep 2018 10:03:37 +0530 Subject: [PATCH 6/9] Update CONTRIBUTING.md --- CONTRIBUTING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3f2438d..6e629bb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -126,7 +126,7 @@ import cv2; print('OpenCV', cv2.__version__) import camelot; print('Camelot', camelot.__version__) -- Make sure you include: - - **Complete traceback** in your bug report. - - **Steps to reproduce the bug**, using code snippets. See [Creating and highlighting code blocks](https://help.github.com/articles/creating-and-highlighting-code-blocks/). +- In your bug report, make sure you include: + - The complete traceback. Just adding the exception message or a part of the traceback won't help us fix your issue sooner. + - Steps to reproduce the bug, using code snippets. See [Creating and highlighting code blocks](https://help.github.com/articles/creating-and-highlighting-code-blocks/). - A link to the PDF document that you were trying to extract tables from, telling us what you expected the code to do and what actually happened. From 18f3c76f835257eb0be0951bbaa1781444cdc2b8 Mon Sep 17 00:00:00 2001 From: Vinayak Mehta Date: Fri, 14 Sep 2018 10:04:39 +0530 Subject: [PATCH 7/9] Update CONTRIBUTING.md --- CONTRIBUTING.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6e629bb..6413025 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -116,7 +116,9 @@ Please don't use GitHub issues for support questions, a better place for them wo ### Bug Reports -- Please include your operating system type and Python version number, along with the version numbers of NumPy, OpenCV and Camelot. You can use the following code snippet to find this information: +In bug reports, make sure you include: + +- Your operating system type and Python version number, along with the version numbers of NumPy, OpenCV and Camelot. You can use the following code snippet to find this information: 
 import platform; print(platform.platform())
@@ -126,7 +128,6 @@ import cv2; print('OpenCV', cv2.__version__)
 import camelot; print('Camelot', camelot.__version__)
-- In your bug report, make sure you include: - - The complete traceback. Just adding the exception message or a part of the traceback won't help us fix your issue sooner. - - Steps to reproduce the bug, using code snippets. See [Creating and highlighting code blocks](https://help.github.com/articles/creating-and-highlighting-code-blocks/). - - A link to the PDF document that you were trying to extract tables from, telling us what you expected the code to do and what actually happened. +- The complete traceback. Just adding the exception message or a part of the traceback won't help us fix your issue sooner. +- Steps to reproduce the bug, using code snippets. See [Creating and highlighting code blocks](https://help.github.com/articles/creating-and-highlighting-code-blocks/). +- A link to the PDF document that you were trying to extract tables from, telling us what you expected the code to do and what actually happened. From 4b290d6b6b81263d5f7c83bb69c7a733e823bff6 Mon Sep 17 00:00:00 2001 From: Vinayak Mehta Date: Fri, 14 Sep 2018 10:05:38 +0530 Subject: [PATCH 8/9] Update CODE_OF_CONDUCT.md --- CODE_OF_CONDUCT.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 7a29aed..f4d7cf3 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,3 +1,3 @@ -Be cordial or be on your way. -- Kenneth Reitz +Be cordial or be on your way. --Kenneth Reitz -https://www.kennethreitz.org/essays/be-cordial-or-be-on-your-way \ No newline at end of file +https://www.kennethreitz.org/essays/be-cordial-or-be-on-your-way From 25319661a1c0b271e1c7ca4ed7f89263da78cdc1 Mon Sep 17 00:00:00 2001 From: Vinayak Mehta Date: Fri, 14 Sep 2018 10:34:28 +0530 Subject: [PATCH 9/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 46be8a0..c7725d6 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ $ pip install camelot-py ### Alternatively -You can install the dependencies [tk](https://www.tcl.tk/) and [ghostscript](https://www.ghostscript.com/) using your system's package manager. After that, clone the repo using: +You can install the dependencies [tk](https://packages.ubuntu.com/trusty/python-tk) and [ghostscript](https://www.ghostscript.com/) using your system's package manager. After that, clone the repo using: 
 $ git clone https://www.github.com/socialcopsdev/camelot