diff --git a/HISTORY.md b/HISTORY.md index ff386d5..44f1b5f 100755 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,6 +1,12 @@ Release History =============== +master +------ + +* Update installation instructions for conda. +* Downgrade numpy version from 1.15.2 to 1.13.3. + 0.2.3 (2018-10-08) ------------------ diff --git a/README.md b/README.md index 184d979..38b1e94 100644 --- a/README.md +++ b/README.md @@ -56,15 +56,25 @@ See [comparison with other PDF table extraction libraries and tools](https://git ## Installation -After [installing the dependencies](https://camelot-py.readthedocs.io/en/latest/user/install.html) ([tk](https://packages.ubuntu.com/trusty/python-tk) and [ghostscript](https://www.ghostscript.com/)), you can simply use pip to install Camelot: +### Using conda + +The easiest way to install Camelot is to install it with [conda](https://conda.io/docs/), which is the package manager that the [Anaconda](http://docs.continuum.io/anaconda/) distribution is built upon. + +
+$ conda install -c camelot-dev camelot-py
+
+ +### Using pip + +After [installing the dependencies](https://camelot-py.readthedocs.io/en/latest/user/install.html#using-pip) ([tk](https://packages.ubuntu.com/trusty/python-tk) and [ghostscript](https://www.ghostscript.com/)), you can simply use pip to install Camelot:
 $ pip install camelot-py[all]
 
-### Alternatively +### From the source code -After [installing the dependencies](https://camelot-py.readthedocs.io/en/latest/user/install.html), clone the repo using: +After [installing the dependencies](https://camelot-py.readthedocs.io/en/latest/user/install.html#using-pip), clone the repo using:
 $ git clone https://www.github.com/socialcopsdev/camelot
@@ -77,8 +87,6 @@ $ cd camelot
 $ pip install ".[all]"
 
-**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 [http://camelot-py.readthedocs.io/](http://camelot-py.readthedocs.io/). diff --git a/docs/user/install.rst b/docs/user/install.rst index 0d8318b..7bfd97c 100644 --- a/docs/user/install.rst +++ b/docs/user/install.rst @@ -3,14 +3,30 @@ Installation of Camelot ======================= -This part of the documentation covers how to install Camelot. First, you'll need to install the dependencies, which include `Tkinter`_ and `ghostscript`_. +This part of the documentation covers how to install Camelot. + +Using conda +----------- + +The easiest way to install Camelot is to install it with `conda`_, which is the package manager that the `Anaconda`_ distribution is built upon. +:: + + $ conda install -c camelot-dev camelot-py + +.. note:: Camelot is available for Python 2.7, 3.5 and 3.6 on Linux, macOS and Windows. For Windows, you will need to install ghostscript which you can get from their `downloads page`_. + +.. _conda: https://conda.io/docs/ +.. _Anaconda: http://docs.continuum.io/anaconda/ +.. _downloads page: https://www.ghostscript.com/download/gsdnld.html + +Using pip +--------- + +First, you'll need to install the dependencies, which include `Tkinter`_ and `ghostscript`_. .. _Tkinter: https://wiki.python.org/moin/TkInter .. _ghostscript: https://www.ghostscript.com -Install the dependencies ------------------------- - These can be installed using your system's package manager. You can run one of the following, based on your OS. For Ubuntu @@ -76,17 +92,14 @@ Or for Windows 32-bit:: If you have ghostscript, you should see the ghostscript version and copyright information. -$ pip install camelot-py[all] ------------------------------ - -After installing the dependencies, you can simply use pip to install Camelot:: +Finally, you can use pip to install Camelot:: $ pip install camelot-py[all] -Get the source code -------------------- +From the source code +-------------------- -Alternatively, you can install from the source by: +After `installing the dependencies`_, you can install from the source by: 1. Cloning the GitHub repository. :: @@ -97,4 +110,6 @@ Alternatively, you can install from the source by: :: $ cd camelot - $ pip install ".[all]" \ No newline at end of file + $ pip install ".[all]" + +.. _installing the dependencies: https://camelot-py.readthedocs.io/en/latest/user/install.html#using-pip \ No newline at end of file diff --git a/setup.py b/setup.py index 9c35289..4d0095f 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ with open('README.md', 'r') as f: requires = [ 'click>=6.7', 'matplotlib>=2.2.3', - 'numpy>=1.15.2', + 'numpy>=1.13.3', 'openpyxl>=2.5.8', 'pandas>=0.23.4', 'pdfminer.six>=20170720',