Merge 6827e60 into 3dd84bd

keis · Nov 22, 2020 · 062706b · 062706b
2 parents 3dd84bd + 6827e60
commit 062706b
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 23 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -2,5 +2,3 @@
 omit =
     */python?.?/*
     */pypy/*
-    */site-packages/nose/*
-    test.py
diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,14 @@
 language: python
-sudo: false
+os: linux
 python:
     - "2.7"
     - "3.6"
     - "3.7"
     - "3.8"
     - "pypy"
 install:
-    - pip install -r test-requirements.txt
+    - pip install '.[tests]'
 script:
-    py.test --pep8 --flakes --cov=matchmock
+    py.test --flakes --cov=matchmock
 after_success:
     coveralls
diff --git a/matchmock.py → matchmock/__init__.py b/matchmock.py → matchmock/__init__.py
diff --git a/setup.cfg b/setup.cfg
@@ -0,0 +1,21 @@
+[metadata]
+name = matchmock
+author = David Keijser
+author_email = keijser@gmail.com
+version = 1.0.0
+description = Hamcrest matchers for mock objects.
+long_description = file: README.md
+url = https://github.com/keis/matchmock
+
+[options]
+packages = matchmock
+
+[options.extras_require]
+tests =
+  pytest>=4
+  pytest-flakes
+  pytest-cov
+  PyHamcrest
+  pep8
+  mock
+  coveralls
diff --git a/setup.py b/setup.py
@@ -1,9 +1,3 @@
 from setuptools import setup
 
-setup(
-    name='matchmock',
-    version='0.7.1',
-    description='Hamcrest matchers for mock objects',
-    url='https://github.com/keis/matchmock',
-    py_modules=['matchmock']
-)
+setup()
diff --git a/test-requirements.txt b/test-requirements.txt
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/test_call.py → tests/test_call.py b/test_call.py → tests/test_call.py
diff --git a/test_matchmock.py → tests/test_matchmock.py b/test_matchmock.py → tests/test_matchmock.py
diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
-envlist = py27,py35
+envlist = py27,py37
 
 [testenv]
-deps = -rtest-requirements.txt
-commands = py.test --pep8 --flakes --cov=matchmock
+deps = .[tests]
+commands = py.test --flakes --cov=matchmock