Skip to content
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

DRY: Only define dependencies in install_requires #306

Merged
merged 4 commits into from
Oct 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ python:
- "3.5"
- "3.6"
install:
- pip install six
- pip install pycryptodome
- pip install chardet
- pip install sortedcontainers
- pip install tox-travis
script:
nosetests --nologcapture
- tox
19 changes: 18 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,21 @@ Any contribution is appreciated! You might want to:
* Code should work for Python 2.7 and Python 3.x (for now).
* Code changes should conform to PEP8 coding style (with a line-width of 120). Existing code may stay as it is.
* New features should be well documented using docstrings.
* Check spelling and grammar.
* Check spelling and grammar.

## Dev setup

```sh
# Clone the repo
git clone https://github.com/pdfminer/pdfminer.six
cd pdfminer.six

# Install dev dependencies
pip install -e .[dev]

# Run tests on all Python versions
tox

# Run tests on a single version
tox -e py36
```
11 changes: 7 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
from setuptools import setup
import sys

import pdfminer as package

requires = ['six', 'pycryptodome', 'sortedcontainers', 'chardet ; python_version > "3.0"']

setup(
name='pdfminer.six',
version=package.__version__,
packages=['pdfminer'],
package_data={'pdfminer': ['cmap/*.pickle.gz']},
install_requires=requires,
install_requires=[
'chardet ; python_version > "3.0"',
'pycryptodome',
'six',
'sortedcontainers',
],
extras_require={"dev": ["nose", "tox"]},
description='PDF parser and analyzer',
long_description=package.__doc__,
license='MIT/X',
Expand Down
9 changes: 2 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
[tox]
envlist = py26,py27,py34,py35,py36
envlist = py{26, 27, 34, 35, 36}

[testenv]
extras = dev
commands = nosetests --nologcapture
deps =
six
pycryptodome
chardet
nose
sortedcontainers