Skip to content

Commit

Permalink
Merge pull request #5 from abertschi/feature/req-cleanup
Browse files Browse the repository at this point in the history
Feature/req cleanup
  • Loading branch information
abertschi authored Nov 22, 2017
2 parents b981f8e + 70ab8d9 commit 8714e22
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 31 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ python:
- "3.6"

install:
- "pip install -r requirements.txt"
- "pip install -r requirements-dev.txt"
- pip install codecov
- "pip install -e ."

# - "pip install tox-travis"

Expand Down
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include LICENSE.md README.md postcard_creator/page_1.svg postcard_creator/page_2.svg requirements.txt
include LICENSE.md README.md postcard_creator/page_1.svg postcard_creator/page_2.svg
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,13 @@ logger = logging.getLogger('postcard_creator')
- [Postcards](https://github.com/abertschi/postcards) is a commandline interface built around this library.
- See [tests](./tests/) for more usage examples.

## Test
```sh
pip install -r requirements-dev.txt
pip install -e .
pytest
```

## Related
- [postcards](https://github.com/abertschi/postcards) - A CLI for the Swiss Postcard Creator
- [postcardcreator](https://github.com/gido/postcardcreator) - node.js API for the Swiss Post Postcard Creator
Expand Down
2 changes: 1 addition & 1 deletion postcard_creator/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.0.3'
__version__ = '0.0.4'
11 changes: 11 additions & 0 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
coverage==4.4.1
idna==2.5
olefile==0.44
py==1.4.34
pytest==3.1.2
pytest-cov==2.5.1
pytest-runner==2.11.1
requests-mock==1.3.0
requests-toolbelt==0.8.0
six==1.10.0
tox==2.7.0
23 changes: 0 additions & 23 deletions requirements.txt

This file was deleted.

16 changes: 11 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
from setuptools import setup
from pip.req import parse_requirements
import codecs
import os
import re

here = os.path.abspath(os.path.dirname(__file__))
install_reqs = parse_requirements('./requirements.txt', session='hack')
reqs = [str(ir.req) for ir in install_reqs]


def read(*parts):
return codecs.open(os.path.join(here, *parts), 'r').read()
Expand All @@ -22,6 +18,17 @@ def find_version(*file_paths):
raise RuntimeError("Unable to find version string.")


reqs = [
'beautifulsoup4',
'Pillow',
'requests-toolbelt',
'cookies',
'idna',
'requests',
'urllib3',
'python_resize_image>=1.1.11'
]

setup(
name='postcard_creator',
version=find_version('postcard_creator', '__init__.py'),
Expand All @@ -46,7 +53,6 @@ def find_version(*file_paths):
'Programming Language :: Python :: 3.6',
],
setup_requires=['pytest-runner'],
tests_require=['pytest', 'coverage'],
package_data={'postcard_creator': ['page_1.svg', 'page_2.svg']},
extras_require={
':python_version=="3.2"': ['virtualenv<14', 'pytest<3'],
Expand Down

0 comments on commit 8714e22

Please sign in to comment.