Skip to content

Commit

Permalink
fix travis build
Browse files Browse the repository at this point in the history
  • Loading branch information
youknowone committed Jan 28, 2017
1 parent 257079d commit 8c694f4
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 10 deletions.
13 changes: 7 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,21 @@ python:
- "3.3"
- "3.4"
- "3.5"
- "3.6"
- "pypy-5.4.1"
- "nightly"
# command to install dependencies
install:
- "pip install flake8 mock pytest pytest-cov python-coveralls ."
- "pip install --upgrade pip"
- "pip install flake8 python-coveralls '.[tests]'"
# command to run tests
script:
- "flake8 --ignore=E501 ."
- "py.test --cov=itunesiap -vv tests/"
- "pytest --cov=itunesiap -vv tests/"
after_success:
- "coveralls"
- bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"
matrix:
allow_failures:
- python:
- pypy
- pypy3
- nightly
- python: "2.6"
- python: "nightly"
1 change: 1 addition & 0 deletions itunesiap/environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ def extract(self):
options[item] = getattr(self, item)
return options


default = Environment(use_production=True, use_sandbox=False, verify_ssl=True)
production = Environment(use_production=True, use_sandbox=False, verify_ssl=True)
sandbox = Environment(use_production=False, use_sandbox=True, verify_ssl=True)
Expand Down
2 changes: 1 addition & 1 deletion itunesiap/receipt.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class InApp(ObjectMapper):
__WHITELIST__ = [
'quantity', 'product_id', 'transaction_id', 'original_transaction_id', 'is_trial_period',
'purchase_date', 'original_purchase_date', 'expires_date', 'cancellation_date',
'purchase_date_ms', 'original_purchase_date_ms', 'expires_date_ms', 'cancellation_date_ms', 'expires_date_formatted',]
'purchase_date_ms', 'original_purchase_date_ms', 'expires_date_ms', 'cancellation_date_ms', 'expires_date_formatted', ]
__EXPORT_FILTERS__ = {
'quantity': int,
'is_trial_period': _to_bool,
Expand Down
13 changes: 10 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ def get_readme():
return ''


tests_require = [
'pytest>=3.0.0', 'pytest-cov', 'tox', 'mock', 'patch',
]


setup(
name='itunes-iap',
version=get_version(),
Expand All @@ -33,9 +38,10 @@ def get_readme():
install_requires=[
'requests[security]', 'prettyexc>=0.6.0', 'six', 'pytz', 'python-dateutil',
],
tests_require=[
'pytest', 'pytest-cov', 'tox', 'mock', 'patch',
],
tests_require=tests_require,
extras_require={
'tests': tests_require,
},
classifiers=[
'Intended Audience :: Developers',
'Operating System :: OS Independent',
Expand All @@ -48,5 +54,6 @@ def get_readme():
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
],
)

0 comments on commit 8c694f4

Please sign in to comment.