Skip to content

Commit

Permalink
Merge pull request #620 from benjaminabel/migrate-to-pytest
Browse files Browse the repository at this point in the history
Migrate to pytest
  • Loading branch information
camilonova committed Feb 17, 2015
2 parents 239ddca + f492652 commit d37505a
Show file tree
Hide file tree
Showing 27 changed files with 319 additions and 482 deletions.
18 changes: 18 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# http://editorconfig.org
# Source: pydanny cookiecutter-django repo

root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.{py,rst,ini}]
indent_style = space
indent_size = 4

[*.yml]
indent_style = space
indent_size = 2
72 changes: 36 additions & 36 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,46 +5,46 @@ sudo: false
env:
- TOX_ENV=py27-flake8
- TOX_ENV=py34-flake8
- TOX_ENV=py26-django14
- TOX_ENV=py27-django14
- TOX_ENV=py26-django15
- TOX_ENV=py26-django16
- TOX_ENV=py27-django15
- TOX_ENV=py27-django16
- TOX_ENV=py32-django15
- TOX_ENV=py32-django16
- TOX_ENV=py33-django15
- TOX_ENV=py33-django16
- TOX_ENV=py34-django15
- TOX_ENV=py34-django16
- TOX_ENV=py27-django17
- TOX_ENV=py27-django18alpha
- TOX_ENV=py27-djangomaster
- TOX_ENV=py32-django17
- TOX_ENV=py32-django18alpha
- TOX_ENV=py32-djangomaster
- TOX_ENV=py33-django17
- TOX_ENV=py33-django18alpha
- TOX_ENV=py33-djangomaster
- TOX_ENV=py34-django17
- TOX_ENV=py34-django18alpha
- TOX_ENV=py34-djangomaster
- TOX_ENV=pypy-django17
- TOX_ENV=pypy-django18alpha
- TOX_ENV=pypy-djangomaster
- TOX_ENV=pypy3-django17
- TOX_ENV=pypy3-django18alpha
- TOX_ENV=pypy3-djangomaster
- TOX_ENV=py26-dj14
- TOX_ENV=py27-dj14
- TOX_ENV=py26-dj15
- TOX_ENV=py26-dj16
- TOX_ENV=py27-dj15
- TOX_ENV=py27-dj16
- TOX_ENV=py32-dj15
- TOX_ENV=py32-dj16
- TOX_ENV=py33-dj15
- TOX_ENV=py33-dj16
- TOX_ENV=py34-dj15
- TOX_ENV=py34-dj16
- TOX_ENV=py27-dj17
- TOX_ENV=py27-dj18a
- TOX_ENV=py27-djmaster
- TOX_ENV=py32-dj17
- TOX_ENV=py32-dj18a
- TOX_ENV=py32-djmaster
- TOX_ENV=py33-dj17
- TOX_ENV=py33-dj18a
- TOX_ENV=py33-djmaster
- TOX_ENV=py34-dj17
- TOX_ENV=py34-dj18a
- TOX_ENV=py34-djmaster
- TOX_ENV=pypy-dj17
- TOX_ENV=pypy-dj18a
- TOX_ENV=pypy-djmaster
- TOX_ENV=pypy3-dj17
- TOX_ENV=pypy3-dj18a
- TOX_ENV=pypy3-djmaster

matrix:
fast_finish: true
allow_failures:
- env: TOX_ENV=py34-djangomaster
- env: TOX_ENV=py33-djangomaster
- env: TOX_ENV=py32-djangomaster
- env: TOX_ENV=py27-djangomaster
- env: TOX_ENV=pypy-djangomaster
- env: TOX_ENV=pypy3-djangomaster
- env: TOX_ENV=py34-djmaster
- env: TOX_ENV=py33-djmaster
- env: TOX_ENV=py32-djmaster
- env: TOX_ENV=py27-djmaster
- env: TOX_ENV=pypy-djmaster
- env: TOX_ENV=pypy3-djmaster

install:
- pip install tox
Expand Down
73 changes: 73 additions & 0 deletions conftest.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
from django.conf import settings


def pytest_configure():
import sys
import tempfile

try:
import django # NOQA
except ImportError:
print("Error: missing test dependency:")
print(" django library is needed to run test suite")
print(" you can install it with 'pip install django'")
print(" or use tox to automatically handle test dependencies")
sys.exit(1)

try:
import shortuuid # NOQA
except ImportError:
print("Error: missing test dependency:")
print(" shortuuid library is needed to run test suite")
print(" you can install it with 'pip install shortuuid'")
print(" or use tox to automatically handle test dependencies")
sys.exit(1)

try:
import dateutil # NOQA
except ImportError:
print("Error: missing test dependency:")
print(" dateutil library is needed to run test suite")
print(" you can install it with 'pip install python-dateutil'")
print(" or use tox to automatically handle test dependencies")
sys.exit(1)

try:
import six # NOQA
except ImportError:
print("Error: missing test dependency:")
print(" six library is needed to run test suite")
print(" you can install it with 'pip install six'")
print(" or use tox to automatically handle test dependencies")
sys.exit(1)

# Dynamically configure the Django settings with the minimum necessary to
# get Django running tests.
settings.configure(
INSTALLED_APPS=[
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.admin',
'django.contrib.sessions',
'tests.testapp',
'django_extensions',
],
MIDDLEWARE_CLASSES=(
'django.contrib.sessions.middleware.SessionMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
),
# Django replaces this, but it still wants it. *shrugs*
DATABASE_ENGINE='django.db.backends.sqlite3',
DATABASES={
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': ':memory:',
}
},
MEDIA_ROOT='/tmp/django_extensions_test_media/',
MEDIA_PATH='/media/',
ROOT_URLCONF='tests.urls',
DEBUG=True,
TEMPLATE_DEBUG=True,
)
26 changes: 0 additions & 26 deletions django_extensions/tests/__init__.py

This file was deleted.

39 changes: 0 additions & 39 deletions django_extensions/tests/shortuuid_field.py

This file was deleted.

76 changes: 0 additions & 76 deletions django_extensions/tests/utils.py

This file was deleted.

Loading

0 comments on commit d37505a

Please sign in to comment.