Merge pull request #254 from datamade/feature/jfc/2.5-release

2.5 release

.travis.yml

@@ -1,3 +1,9 @@
+branches:
+  only:
+    - master
+    - "2.5"
+    - "/^v.*$/"
+
 language: python
 
 python: '3.4'
@@ -26,3 +32,13 @@ group: deprecated-2017Q4
 script:
     - flake8 ./councilmatic_core/*.py
     - pytest -sv
+
+deploy:
+  provider: pypi
+  user: datamade.wheelbuilder
+  password:
+    secure: v9nZlccPLNiKps2DPDkb789XS1ukiiV7V7HSGpVpyrD5KgSzsV14W4CHjpA9tkGebajTz/VL4a2IQUtVwTXA9bgBaDguIpxuDUz5UM7qgy6gYfzmG+nJYqtrXZgBAlPAkTTnwiXTT+dIMO41O9fafVUSxZrspwRQfTuvL1AOwa/4Druv60/Qas57RVek3J/ISfpvdmV/DtawgXroE339+Wg3c1mc2N6olPNJuYFSPKo4pv9WnWSgOSJGPpELeMhFUhzDtTvHrOyU1nugXE/xXQcNa3ejaqPAXWFUnqE3MlQmvq4z3aa0SgKKKtr30CBA/p+ztws5GM8qI06rJC/o6FknjjbNoTycm1TYPb2rGMD7b/vC5R9RjTbuAYacS+mmags36NyBrAdd7AF4E5K9KVUrhjG4c0eMEl9LTq6ItopQm52Z+LHNnMi+8iVTqatzSVzNpMA9biDG8wASw+Zil6YZxa0fwSvM/wF0vekHvoXPPd92xvAfcAgS11gyx3NBfM+1c1FH6l9V5/UkcWwKSzFzGeFUkXw8PhBEozeFT6n59WDWiwUU22Tp6B4+25WO1XImUqyRbMoz2xLcRD+9CaEfYeKyH8IGoVDrqOZDVW62nMWeyesE+/ZMGFbxibdJd/Lsi+Q/DXQKJLSdpfkGDzL8CuTP1Ng95XQgKSPUfZc=
+  on:
+    tags: true
+    distributions: sdist bdist_wheel
+    repo: datamade/django-councilmatic

RELEASENOTES.md

@@ -1,5 +1,13 @@
 # Release notes for django-councilmatic
 
+## Version 2.5.0
+
+*Changes*
+
+`2.5.0` constitutes a major, backwards incompatible release that factors custom Django models and the `import_data` management command out of `django-councilmatic`. Instead, `django-councilmatic>=2.5.0` extends the Django implementation of the Open Civic Data standard, `python-opencivicdata`, and updates application code throughout to accomodate the model changes. Approaches for further extension of the base models are outlined in the README.
+
+**Release date:** 7-23-2019
+
 ## Version 0.10.15
 
 *Changes*
@@ -294,4 +302,4 @@ Enforce a rollback in the event of an IntegrityError.
 
 See [commit history](https://github.com/datamade/django-councilmatic/commits/master) for prior changes.
 
-**Release date:** 11-6-2017
+**Release date:** 11-6-2017

councilmatic_core/migrations/0047_update_filepath.py

@@ -1,5 +1,7 @@
 # Generated by Django 2.1.9 on 2019-06-18 17:30
+import os
 
+from django.conf import settings
 import django.core.files.storage
 from django.db import migrations, models
 
@@ -14,6 +16,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='person',
             name='headshot',
-            field=models.FileField(default='images/headshot_placeholder.png', storage=django.core.files.storage.FileSystemStorage(base_url='/', location='/Users/hannah/projects/chi-councilmatic/councilmatic/../chicago/static'), upload_to='images/headshots'),
+            field=models.FileField(default='images/headshot_placeholder.png', storage=django.core.files.storage.FileSystemStorage(base_url='/', location=os.path.join(settings.STATIC_PATH)), upload_to='images/headshots'),
         ),
     ]

setup.py

@@ -9,7 +9,7 @@
 
 setup(
     name='django-councilmatic',
-    version='1.0',
+    version='2.5.0',
     packages=find_packages(exclude=('tests',)),
     include_package_data=True,
     license='MIT License',  # example license