Exclude some test for setup.py

4 files changed, 21 insertions, 26 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index 985d0fa21..214e1601c 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
-include CHANGES.txt
+include CHANGES.md
 include COPYING
 recursive-include fixtures *
 recursive-include install *
@@ -8,34 +8,24 @@ recursive-include install *
 recursive-include pot *
 include README.md
 recursive-include scripts *
-recursive-include translations *
 include version.py
-include zanata.xml
 recursive-include ishtar_common/static *
-recursive-include ishtar_pdl/static *
-recursive-include archaeological_finds/templates *
-recursive-include archaeological_files_pdl/templates *
-recursive-include django-simple-history/simple_history/templates *
-recursive-include archaeological_files/templates *
 recursive-include ishtar_common/templates *
+recursive-include archaeological_files/templates *
+recursive-include archaeological_files_pdl/templates *
 recursive-include archaeological_operations/templates *
 recursive-include archaeological_context_records/templates *
-recursive-include ishtar_pdl/templates *
-recursive-include archaeological_finds/fixtures *
-recursive-include archaeological_warehouse/fixtures *
-recursive-include archaeological_files/fixtures *
+recursive-include archaeological_finds/templates *
+recursive-include archaeological_warehouse/templates *
 recursive-include ishtar_common/fixtures *
+recursive-include archaeological_files/fixtures *
 recursive-include archaeological_operations/fixtures *
 recursive-include archaeological_context_records/fixtures *
-recursive-include archaeological_finds/locale *
-recursive-include archaeological_warehouse/locale *
-recursive-include archaeological_files_pdl/locale *
-recursive-include archaeological_files/locale *
-recursive-include ishtar_common/locale *
-recursive-include archaeological_operations/locale *
-recursive-include archaeological_context_records/locale *
-recursive-include archaeological_finds/tests *
+recursive-include archaeological_finds/fixtures *
+recursive-include archaeological_warehouse/fixtures *
+recursive-include locale *
 recursive-include ishtar_common/tests *
 recursive-include archaeological_operations/tests *
 recursive-include archaeological_context_records/tests *
+recursive-include archaeological_finds/tests *
 prune docs
diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py
index b376a34ff..ab27a5b01 100644
--- a/archaeological_finds/tests.py
+++ b/archaeological_finds/tests.py
@@ -31,6 +31,7 @@ from django.core.exceptions import ObjectDoesNotExist
 from django.core.files import File
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.core.urlresolvers import reverse
+from django.test import tag
 from django.test.client import Client
 from ishtar_common.models import ImporterType, IshtarUser, ImporterColumn,\
     FormaterType, ImportTarget, IshtarSiteProfile, ProfileType
@@ -2020,6 +2021,7 @@ class GeomaticTest(FindInit, TestCase):
         bf = models.BaseFind.objects.get(pk=bf.pk)
         self.assertEqual(bf.x, 33)
 
+    @tag("not-setup-py")
     def test_post_save_point(self):
         find = self.finds[0]
         base_find = find.base_finds.all()[0]
diff --git a/example_project/local_settings.py.setup b/example_project/local_settings.py.setup
index 54dc99c4a..f3cf92a39 100644
--- a/example_project/local_settings.py.setup
+++ b/example_project/local_settings.py.setup
@@ -1,11 +1,11 @@
 DATABASES = {
     'default': {
         'ENGINE': 'django.contrib.gis.db.backends.postgis',
-        'NAME': 'ishtar-test',
-        'USER': 'ishtar-test',
-        'PASSWORD': 'ishtar-test',
-        'HOST': '',
-        'PORT': '5432',
+        'NAME': 'ishtar-setup-test',
+        'USER': 'ishtar-setup-test',
+        'PASSWORD': 'ishtar-setup-test',
+        'HOST': '127.0.0.1',
+        'PORT': '',
     }
 }
 
diff --git a/example_project/runtests.py b/example_project/runtests.py
index c10a73db4..c518429e9 100644
--- a/example_project/runtests.py
+++ b/example_project/runtests.py
@@ -17,12 +17,15 @@ if not os.path.exists(local_settings):
 import django
 from django.test.utils import get_runner
 from django.conf import settings
+from django.core.management import call_command
 
 
 def runtests():
     django.setup()
+    call_command('collectstatic', interactive=False, verbosity=0)
     TestRunner = get_runner(settings)
-    test_runner = TestRunner(verbosity=1, interactive=True)
+    test_runner = TestRunner(verbosity=1, interactive=True,
+                             exclude_tags=["not-setup-py"])
     failures = test_runner.run_tests(
         ["ishtar_common.tests",
          "archaeological_files.tests",