diff --git a/README.md b/README.md index 8e86772..184d979 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ See [comparison with other PDF table extraction libraries and tools](https://git 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:
-$ pip install camelot-py
+$ pip install camelot-py[all]
 
### Alternatively @@ -74,7 +74,7 @@ and install Camelot using pip:
 $ cd camelot
-$ pip install .
+$ pip install ".[all]"
 
**Note:** Use a [virtualenv](https://virtualenv.pypa.io/en/stable/) if you don't want to affect your global Python installation. diff --git a/camelot/__version__.py b/camelot/__version__.py index 855e8c8..a6f488e 100644 --- a/camelot/__version__.py +++ b/camelot/__version__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -VERSION = (0, 2, 1) +VERSION = (0, 2, 2) __title__ = 'camelot-py' __description__ = 'PDF Table Extraction for Humans.' diff --git a/docs/user/install.rst b/docs/user/install.rst index 99c73cf..0d8318b 100644 --- a/docs/user/install.rst +++ b/docs/user/install.rst @@ -76,12 +76,12 @@ Or for Windows 32-bit:: If you have ghostscript, you should see the ghostscript version and copyright information. -$ pip install camelot-py ------------------------- +$ pip install camelot-py[all] +----------------------------- After installing the dependencies, you can simply use pip to install Camelot:: - $ pip install camelot-py + $ pip install camelot-py[all] Get the source code ------------------- @@ -97,4 +97,4 @@ Alternatively, you can install from the source by: :: $ cd camelot - $ pip install . \ No newline at end of file + $ pip install ".[all]" \ No newline at end of file diff --git a/requirements-dev.txt b/requirements-dev.txt deleted file mode 100644 index 57c1892..0000000 --- a/requirements-dev.txt +++ /dev/null @@ -1,5 +0,0 @@ -codecov==2.0.15 -pytest==3.8.0 -pytest-cov==2.6.0 -pytest-runner==4.2 -Sphinx==1.7.9 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 20bd683..0000000 --- a/requirements.txt +++ /dev/null @@ -1,8 +0,0 @@ -click==6.7 -matplotlib==2.2.3 -numpy==1.15.2 -opencv-python==3.4.2.17 -openpyxl==2.5.8 -pandas==0.23.4 -pdfminer.six==20170720 -PyPDF2==1.26.0 diff --git a/setup.py b/setup.py index 02a8199..23edc7d 100644 --- a/setup.py +++ b/setup.py @@ -13,17 +13,31 @@ with open('README.md', 'r') as f: readme = f.read() +requires = [ + 'click==6.7', + 'matplotlib==2.2.3', + 'numpy==1.15.2', + 'openpyxl==2.5.8', + 'pandas==0.23.4', + 'pdfminer.six==20170720', + 'PyPDF2==1.26.0' +] + +all_requires = [ + 'opencv-python==3.4.2.17' +] + +dev_requires = [ + 'codecov==2.0.15', + 'pytest==3.8.0', + 'pytest-cov==2.6.0', + 'pytest-runner==4.2', + 'Sphinx==1.7.9' +] +dev_requires = dev_requires + all_requires + + def setup_package(): - reqs = [] - with open('requirements.txt', 'r') as f: - for line in f: - reqs.append(line.strip()) - - dev_reqs = [] - with open('requirements-dev.txt', 'r') as f: - for line in f: - dev_reqs.append(line.strip()) - metadata = dict(name=about['__title__'], version=about['__version__'], description=about['__description__'], @@ -34,9 +48,10 @@ def setup_package(): author_email=about['__author_email__'], license=about['__license__'], packages=find_packages(exclude=('tests',)), - install_requires=reqs, + install_requires=requires, extras_require={ - 'dev': dev_reqs + 'all': all_requires, + 'dev': dev_requires }, entry_points={ 'console_scripts': [