Skip to content

Commit

Permalink
Simplification of testing requirement declaration, fix for comparison…
Browse files Browse the repository at this point in the history
… on Travis.
  • Loading branch information
amcgregor committed Sep 5, 2017
1 parent c6385e7 commit afc72c4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ env:
matrix:
include:
- python: "3.5"
env: NO_PYTZ=1 MONGODB_VERSION=3.4.4
env: MONGODB_VERSION=3.4.4 NO_PYTZ=1
- python: "3.5"
env: MONGODB_VERSION=3.2.13

Expand All @@ -34,8 +34,8 @@ before_install:

install:
- 'travis_retry pip install --upgrade setuptools pip pytest pytest-cov codecov "setuptools_scm>=1.9" cffi'
- 'pip install -e ".[development,logger]"'
- '[[ -e $NO_PYTZ ]] && pip uninstall --quiet --yes pytz tzlocal'
- 'pip install -e ".[development]"'
- 'test -n $NO_PYTZ && pip uninstall --quiet --yes pytz tzlocal'

script:
python setup.py test
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
'pytest-isort', # import ordering
'misaka', 'pygments', # Markdown field support
'futures; python_version < "3.4"', # futures support
'pytz', 'tzlocal>=1.4', # timezone support, logger support
]


Expand Down Expand Up @@ -91,7 +92,7 @@

extras_require = dict(
decimal = ['pymongo>=3.4'], # More modern version required for Decimal128 support.
development = tests_require + ['pre-commit'], # Development-time dependencies.
development = tests_require + ['pre-commit', 'bandit'], # Development-time dependencies.
logger = ['tzlocal>=1.4'], # Timezone support to store log times in UTC like a sane person.
markdown = ['misaka', 'pygments'], # Markdown text storage.
scripting = ['javascripthon<1.0'], # Allow map/reduce functions and "stored functions" to be Python.
Expand Down

0 comments on commit afc72c4

Please sign in to comment.