From 0411f71fef6fb0c27ec43cf6554b5579681636c1 Mon Sep 17 00:00:00 2001 From: David Cramer Date: Thu, 6 Oct 2011 15:03:50 -0400 Subject: [PATCH] More cleanup: removed deb package items and updated test requirements --- MANIFEST.in | 5 +-- debian/changelog | 5 --- debian/compat | 1 - debian/control | 17 --------- debian/docs | 1 - debian/pyversions | 1 - debian/rules | 42 ---------------------- runtests.py | 92 ----------------------------------------------- setup.py | 3 +- 9 files changed, 2 insertions(+), 165 deletions(-) delete mode 100644 debian/changelog delete mode 100644 debian/compat delete mode 100644 debian/control delete mode 100644 debian/docs delete mode 100644 debian/pyversions delete mode 100755 debian/rules delete mode 100644 runtests.py diff --git a/MANIFEST.in b/MANIFEST.in index 4acbcfc3..72623b55 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,2 @@ -include setup.py README.rst MANIFEST.in LICENSE distribute_setup.py -recursive-include sentry/templates * -recursive-include sentry/static * -recursive-include sentry/plugins/*/templates * +include setup.py README.rst MANIFEST.in LICENSE global-exclude *~ diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 9ab217e7..00000000 --- a/debian/changelog +++ /dev/null @@ -1,5 +0,0 @@ -python-django-sentry (1.5.1-0) testing; urgency=high - - * Initial Debian package - - -- Bruno Clermont Tue, 14 Dec 2010 16:25:00 -0500 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 7ed6ff82..00000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/debian/control b/debian/control deleted file mode 100644 index 6057d381..00000000 --- a/debian/control +++ /dev/null @@ -1,17 +0,0 @@ -Source: python-django-sentry -Section: python -Priority: optional -Maintainer: David Cramer -Homepage: https://github.com/dcramer/django-sentry -Bugs: https://github.com/dcramer/sentry/issues -Build-Depends: debhelper, python-support - -Package: python-django-sentry -Architecture: all -Depends: ${python:Depends}, python-support, python-django -Provides: ${python:Provides} -Description: - Sentry provides you with a generic interface to view and interact with your - error logs. By default, it will catch any exception thrown by Django and store - it in a database. With this it allows you to interact and view near real-time - information to discover issues and more easily trace them in your application. diff --git a/debian/docs b/debian/docs deleted file mode 100644 index a1320b1b..00000000 --- a/debian/docs +++ /dev/null @@ -1 +0,0 @@ -README.rst diff --git a/debian/pyversions b/debian/pyversions deleted file mode 100644 index 8b253bc3..00000000 --- a/debian/pyversions +++ /dev/null @@ -1 +0,0 @@ -2.4- diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 1a44f4e1..00000000 --- a/debian/rules +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/make -f - -# Verbose mode -#export DH_VERBOSE=1 - -clean: - dh_testdir - dh_testroot - - rm -rf build django-sentry.egg-info -# find django-sentry/ -name *.pyc | xargs rm -f - - dh_clean - -build: - dh_testdir - - python setup.py build - -install: - dh_testdir - dh_installdirs - - python setup.py install --root $(CURDIR)/debian/python-django-sentry - -binary-indep: install - -binary-arch: install - dh_install - dh_installdocs -# dh_installchangelogs - dh_compress - dh_fixperms - dh_pysupport - dh_gencontrol - dh_installdeb - dh_md5sums - dh_builddeb -- -Z lzma -z9 - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary - diff --git a/runtests.py b/runtests.py deleted file mode 100644 index e0e0a12f..00000000 --- a/runtests.py +++ /dev/null @@ -1,92 +0,0 @@ -#!/usr/bin/env python -import logging -import sys -from os.path import dirname, abspath, join -from optparse import OptionParser - -sys.path.insert(0, dirname(abspath(__file__))) - -logging.getLogger('sentry').addHandler(logging.StreamHandler()) - -from django.conf import settings - -if not settings.configured: - settings.configure( - DATABASE_ENGINE='sqlite3', - DATABASES={ - 'default': { - 'ENGINE': 'sqlite3', - 'TEST_NAME': 'sentry_tests.db', - }, - }, - # HACK: this fixes our threaded runserver remote tests - # DATABASE_NAME='test_sentry', - TEST_DATABASE_NAME='sentry_tests.db', - INSTALLED_APPS=[ - 'django.contrib.auth', - 'django.contrib.admin', - 'django.contrib.sessions', - 'django.contrib.sites', - - # Included to fix Disqus' test Django which solves IntegrityMessage case - 'django.contrib.contenttypes', - - 'south', - 'djcelery', # celery client - 'haystack', - - 'sentry', - 'sentry.client', - 'sentry.client.celery', - - # included plugin tests - 'sentry.plugins.sentry_servers', - 'sentry.plugins.sentry_sites', - 'sentry.plugins.sentry_urls', - 'sentry.plugins.sentry_redmine', - - 'tests', - ], - ROOT_URLCONF='', - DEBUG=False, - SITE_ID=1, - BROKER_HOST="localhost", - BROKER_PORT=5672, - BROKER_USER="guest", - BROKER_PASSWORD="guest", - BROKER_VHOST="/", - CELERY_ALWAYS_EAGER=True, - SENTRY_THRASHING_LIMIT=0, - TEMPLATE_DEBUG=True, - HAYSTACK_SITECONF='sentry.search_indexes', - HAYSTACK_SEARCH_ENGINE='whoosh', - SENTRY_SEARCH_ENGINE='whoosh', - SENTRY_SEARCH_OPTIONS={ - 'path': join(dirname(__file__), 'sentry_test_index'), - }, - ) - import djcelery - djcelery.setup_loader() - -from django_nose import NoseTestSuiteRunner - -def runtests(*test_args, **kwargs): - if 'south' in settings.INSTALLED_APPS: - from south.management.commands import patch_for_test_db_setup - patch_for_test_db_setup() - - if not test_args: - test_args = ['tests'] - - test_runner = NoseTestSuiteRunner(**kwargs) - - failures = test_runner.run_tests(test_args) - sys.exit(failures) - -if __name__ == '__main__': - parser = OptionParser() - parser.add_option('--verbosity', dest='verbosity', action='store', default=1, type=int) - parser.add_options(NoseTestSuiteRunner.options) - (options, args) = parser.parse_args() - - runtests(*args, **options.__dict__) \ No newline at end of file diff --git a/setup.py b/setup.py index c9344963..966b10d3 100755 --- a/setup.py +++ b/setup.py @@ -13,7 +13,6 @@ tests_require = [ 'Django>=1.2,<1.4', 'nose', - 'django-nose', ] install_requires = [ @@ -35,7 +34,7 @@ setup( install_requires=install_requires, tests_require=tests_require, extras_require={'test': tests_require}, - test_suite='runtests.runtests', + test_suite='nose.collector', include_package_data=True, classifiers=[ 'Intended Audience :: Developers',