Permalink
Browse files

Start transitioning to pytest.

  • Loading branch information...
1 parent 5c68db6 commit d83a51e28e739cd827ff565dcf51de42e1142a6c @chrisrossi chrisrossi committed Jul 3, 2016
Showing with 873 additions and 37 deletions.
  1. +1 −0 .gitignore
  2. +2 −9 setup.cfg
  3. +32 −25 setup.py
  4. +828 −0 tests/test_functional.py
  5. +10 −3 tox.ini
View
@@ -1,6 +1,7 @@
*.pyc
*.egg-info
.*.swp
+.cache
.coverage
.ropeproject
.tox
View
@@ -1,12 +1,5 @@
-[easy_install]
-zip_ok = false
-
-[nosetests]
-match=^test
-where=acidfs
-nocapture=1
-cover-package=acidfs
-cover-erase=1
+[pytest]
+addopts = --cov acidfs --cov-report=term-missing
[aliases]
dev = develop easy_install acidfs[testing]
View
@@ -8,12 +8,17 @@
requires = [
'transaction',
]
-tests_require = requires + ['mock']
-if sys.version < '2.7':
- tests_require += ['unittest2']
+PY3 = sys.version_info[0] == 3
+PY2 = sys.version_info[0] == 2
+
+tests_require = requires + ['pytest', 'pytest-cov']
+
+if PY2:
+ tests_require += ['mock']
+
+testing_extras = tests_require + ['tox']
-testing_extras = tests_require + ['nose', 'coverage', 'tox']
doc_extras = ['Sphinx']
here = os.path.abspath(os.path.dirname(__file__))
@@ -23,11 +28,12 @@
except IOError:
README = CHANGES = ''
-setup(name='acidfs',
- version=VERSION,
- description='ACID semantics for the filesystem.',
- long_description=README + '\n\n' + CHANGES,
- classifiers=[
+setup(
+ name='acidfs',
+ version=VERSION,
+ description='ACID semantics for the filesystem.',
+ long_description=README + '\n\n' + CHANGES,
+ classifiers=[
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
"Programming Language :: Python",
@@ -40,19 +46,20 @@
#"Programming Language :: Python :: Implementation :: PyPy",
"Topic :: Database",
"License :: Repoze Public License",
- ],
- keywords='git acid filesystem transaction',
- author="Chris Rossi",
- author_email="pylons-discuss@googlegroups.com",
- url="http://pylonsproject.org",
- license="BSD-derived (http://www.repoze.org/LICENSE.txt)",
- packages=find_packages(),
- include_package_data=True,
- zip_safe=False,
- install_requires=requires,
- tests_require=tests_require,
- extras_require={
- 'testing': testing_extras,
- 'docs': doc_extras,
- },
- test_suite="acidfs.tests")
+ ],
+ keywords='git acid filesystem transaction',
+ author="Chris Rossi",
+ author_email="pylons-discuss@googlegroups.com",
+ url="http://pylonsproject.org",
+ license="BSD-derived (http://www.repoze.org/LICENSE.txt)",
+ packages=find_packages(),
+ include_package_data=True,
+ zip_safe=False,
+ install_requires=requires,
+ tests_require=tests_require,
+ extras_require={
+ 'testing': testing_extras,
+ 'docs': doc_extras,
+ },
+ test_suite="acidfs.tests",
+)
Oops, something went wrong.

0 comments on commit d83a51e

Please sign in to comment.