Merge branch 'release/0.1.4'

alexhayes · Oct 22, 2015 · 1493463 · 1493463
2 parents 427b3ec + 1ee1dc4
commit 1493463
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Release 0.1.4 - Fri Oct 23 08:35:51 AEDT 2015
+
+- Ensured Sample_GeoPC_AU_Places.csv is installed for testing purposes.
+
 # Release 0.1.3 - Thu Oct 22 13:28:30 AEDT 2015
 
 - Added migration for changes to verbose names for locality, postcode and suburb.

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -4,7 +4,8 @@ include README.rst
 include MANIFEST.in
 include setup.cfg
 include setup.py
-recursive-include django-geopostcodes *.py
+recursive-include django_geopostcodes *.py
+recursive-include django_geopostcodes *.csv
 recursive-include docs *
 recursive-include requirements *.txt
 recursive-include scripts/ *

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.1.3
+0.1.4
diff --git a/django_geopostcodes/__init__.py b/django_geopostcodes/__init__.py
@@ -11,7 +11,7 @@
     'version_info_t', ('major', 'minor', 'micro', 'releaselevel', 'serial'),
 )
 
-VERSION = version_info_t(0, 1, 3, '', '')
+VERSION = version_info_t(0, 1, 4, '', '')
 __version__ = '{0.major}.{0.minor}.{0.micro}{0.releaselevel}'.format(VERSION)
 __author__ = 'Alex Hayes'
 __contact__ = 'alex@alution.com'

diff --git a/django_geopostcodes/tests/test_helpers.py b/django_geopostcodes/tests/test_helpers.py
@@ -12,12 +12,16 @@
 from ..models import Locality
 
 
+def create_sample_localities():
+    import_localities(os.path.join(os.path.dirname(__file__),
+                                   'fixtures',
+                                   'Sample_GeoPC_AU_Places.csv'),
+                      "\t")
+
+
 class ImportLocalitiesTestCase(unittest.TestCase):
 
     def test_import_localities(self):
         self.assertEqual(Locality.objects.count(), 0)
-        import_localities(os.path.join(os.path.dirname(__file__),
-                                       'fixtures',
-                                       'Sample_GeoPC_AU_Places.csv'),
-                          "\t")
+        create_sample_localities()
         self.assertEqual(Locality.objects.count(), 100)
diff --git a/setup.py b/setup.py
@@ -123,6 +123,8 @@ def reqs(*f):
     platforms=['any'],
     license='MIT',
     packages=find_packages(exclude=['tests', 'tests.*']),
+    package_dir={'django_geopostcodes': 'django_geopostcodes'},
+    package_data={'django_geopostcodes': ['tests/fixtures/*.csv']},
     zip_safe=False,
     install_requires=install_requires,
     tests_require=tests_require,