Skip to content

Commit

Permalink
Compatibility with pytest 4 (tarpas#118) closes tarpas#117
Browse files Browse the repository at this point in the history
    Remove requirements.txt, rely on setup.py
    requirements: allow pytest<5, pin coverage<5
  • Loading branch information
blueyed authored and tarpas committed Nov 26, 2018
1 parent 6f5c4ac commit 5ce358a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 8 deletions.
5 changes: 1 addition & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@ FROM python:3.4
RUN mkdir -p /usr/src/app
WORKDIR /usr/src/app

COPY requirements.txt /usr/src/app/
RUN pip install --no-cache-dir -r requirements.txt

COPY . /usr/src/app

RUN pip install -e .

RUN py.test -v --tb=native
RUN pytest -v --tb=native
2 changes: 0 additions & 2 deletions requirements.txt

This file was deleted.

4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
name='pytest-testmon',
description='take TDD to a new level with py.test and testmon',
long_description=''.join(open('README.rst').readlines()),
version='0.9.13',
version='0.9.14',
license='MIT',
platforms=['linux', 'osx', 'win32'],
packages=['testmon'],
Expand All @@ -19,7 +19,7 @@
'testmon = testmon.tox_testmon',
],
},
install_requires=['pytest>=2.8.0,<4', 'coverage>=4'],
install_requires=['pytest>=2.8.0,<5', 'coverage>=4,<5'],
classifiers=[
'Development Status :: 4 - Beta',
'Intended Audience :: Developers',
Expand Down

0 comments on commit 5ce358a

Please sign in to comment.