Skip to content

Commit

Permalink
Fixed issue when running setup.py and PyPDF2 is not installed
Browse files Browse the repository at this point in the history
  • Loading branch information
Stefan Lehmann authored and Stefan Lehmann committed Feb 27, 2015
1 parent c742de3 commit bfca3c2
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
pdftools
========
* **Version** 1.0.4
* **Version** 1.0.6
* **Copyright (c)** 2015 Stefan Lehmann
* **License:** MIT
* **Description:** This is a collection of convenience python scripts
for fast and painless pdf manipulation via commandline. It is based on the
* **Description:** This is a collection of convenience python scripts
for fast and painless pdf manipulation via commandline. It is based on the
PyPdf2 package.

## Features
Expand All @@ -21,7 +21,7 @@ listed below.

### pdfadd.py

Add pages from a source pdf file to a destination file. The output is either
Add pages from a source pdf file to a destination file. The output is either
written in a new file or to the destination file.

```
Expand Down Expand Up @@ -165,7 +165,7 @@ usage: pdfmerge.py [-h] -o OUTPUT [-d] inputs [inputs ...]
Merge the pages of multiple input files in one output file.
positional arguments:n
positional arguments:n
inputs list of input files
optional arguments:
Expand Down Expand Up @@ -195,4 +195,4 @@ optional arguments:
-o OUTPUT, --output OUTPUT
filename of the output file
-d, --delete delete input files after merge
```
```
5 changes: 3 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pdftools
========

- **Version** 1.0.4
- **Version** 1.0.5
- **Copyright (c)** 2015 Stefan Lehmann
- **License:** MIT
- **Description:** This is a collection of convenience python scripts
Expand Down Expand Up @@ -174,7 +174,7 @@ is according to the order of the input files.

Merge the pages of multiple input files in one output file.

positional arguments:n
positional arguments:n
inputs list of input files

optional arguments:
Expand Down Expand Up @@ -205,3 +205,4 @@ odd pages in the other.
-o OUTPUT, --output OUTPUT
filename of the output file
-d, --delete delete input files after merge

2 changes: 1 addition & 1 deletion pdftools/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
__version__ = "1.0.4"
__version__ = "1.0.6"
from pdftools.pdftools import *
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python
from setuptools import setup
from pdftools import __version__
__version__ = "1.0.6"

setup(
name='pdftools',
Expand Down

0 comments on commit bfca3c2

Please sign in to comment.