Merge pull request #35 from crccheck/maintenance

Maintenance tweaks

Author: crccheck

.travis.yml

@@ -1,6 +1,6 @@
 language: python
 # Generate this env list with:
-# tox -l | awk '{ print "  - TOX_ENV="$0}
+# tox -l | awk '{ print "  - TOX_ENV="$0}'
 env:
   - TOX_ENV=django14-py26
   - TOX_ENV=django14-py27
@@ -13,9 +13,10 @@ env:
   - TOX_ENV=django17-py33
   - TOX_ENV=django17-py34
   - TOX_ENV=django18-py27
-  - TOX_ENV=django18-py33
   - TOX_ENV=django18-py34
-  - TOX_ENV=coveralls-django17-py27
+  # pending full travisci support for python 3.5
+  # - TOX_ENV=django18-py35
+  - TOX_ENV=coveralls-django18-py27
 install: pip install tox coveralls
 script: tox -e $TOX_ENV
 after_success: coveralls

Makefile

@@ -23,7 +23,10 @@ clean:
 	rm -rf MANIFEST
 	rm -rf build
 	rm -rf dist
+	rm -rf *.egg
 	rm -rf *.egg-info
+	find . -name "*.pyc" -delete
+	find . -name ".DS_Store" -delete
 
 test:
 	python -W ignore::RuntimeWarning $(MANAGE) test django_object_actions
@@ -40,17 +43,18 @@ resetdb:
 	python $(MANAGE) migrate --noinput
 	python $(MANAGE) loaddata sample_data
 
-# Release Instructions:
-#
-# 1. bump version number above
-# 2. `make release`
-# 3. git push origin master --tags
-#
-# If this doesn't work, make sure you have wheels installed:
-#     pip install wheel
-release:
+# Set the version. Done this way to avoid fancy, brittle Python import magic
+version:
 	@sed -i -r /version/s/[0-9.]+/$(VERSION)/ setup.py
 	@sed -i -r /version/s/[0-9.]+/$(VERSION)/ django_object_actions/__init__.py
+
+# Release instructions
+# 1. bump VERSION above
+# 2. run `make release`
+# 3. `git push --tags origin master`
+# 4. update release notes
+release: clean version
 	@git commit -am "bump version to v$(VERSION)"
 	@git tag v$(VERSION)
+	@-pip install wheel > /dev/null
 	python setup.py sdist bdist_wheel upload

example_project/polls/factories.py

@@ -11,7 +11,8 @@
 
 
 class UserFactory(factory.DjangoModelFactory):
-    FACTORY_FOR = get_user_model()
+    class Meta:
+        model = get_user_model()
     first_name = factory.Sequence(lambda i: u'John{0}'.format(i))
     last_name = factory.Sequence(lambda i: u'Doe{0}'.format(i))
     username = factory.LazyAttribute(lambda x: '{0}{1}'.format(
@@ -22,4 +23,5 @@ class UserFactory(factory.DjangoModelFactory):
 
 
 class CommentFactory(factory.DjangoModelFactory):
-    FACTORY_FOR = models.Comment
+    class Meta:
+        model = models.Comment

requirements.txt

@@ -1,9 +1,9 @@
-Django==1.8.4
+Django==1.8.6
 dj-database-url==0.3.0
 django-extensions==1.5.9
-tox==2.1.1
-factory-boy==2.5.2
-coverage==3.7.1
+tox==2.2.1
+factory-boy==2.6.0
+coverage==4.0.2
 
 # for heroku support
-psycopg2==2.5.4
+psycopg2==2.6.1

setup.py

@@ -25,5 +25,7 @@
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
     ],
 )

tox.ini

@@ -5,7 +5,8 @@ envlist =
     django14-{py26,py27},
     django15-{py26,py27},
     django16-{py26,py27,py33},
-    django{17,18}-{py27,py33,py34},
+    django17-{py27,py33,py34},
+    django18-{py27,py34,py35},
     # run one of the tests again but with coverage
     coveralls-django18-py27,
 skipsdist = True
@@ -18,7 +19,7 @@ commands =
 deps =
     dj_database_url==0.3.0
     django-extensions==1.5.9
-    factory-boy==2.4.1
+    factory-boy==2.6.0
     coveralls: coverage
     django14: Django<1.5
     django15: Django<1.6