Merge branch 'release-0.5.2' into develop

genomics-geek · genomics-geek · commit 503f1d637f50 · 2018-05-16T11:19:35.000-04:00
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -61,3 +61,10 @@ History
 `Full Changelog <https://github.com/chopdgd/django-user-activities/compare/v0.5.0...v0.5.1>`_
 
 * Made updates to dependencies library
+
+0.5.2 (2017-05-16)
+++++++++++++++++++
+
+`Full Changelog <https://github.com/chopdgd/django-user-activities/compare/v0.5.1...v0.5.2>`_
+
+* Updated setup.py to read requirments.txt
diff --git a/requirements.txt b/requirements.txt
@@ -4,5 +4,5 @@
 djangorestframework==3.8.2
 
 django-filter==1.1.0
-django-genomix==0.6.1
+django-genomix==0.6.2
 django-model-utils==3.1.2
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.5.1
+current_version = 0.5.2
 commit = True
 tag = True
 
diff --git a/user_activities/__init__.py b/user_activities/__init__.py
@@ -1 +1 @@
-__version__ = '0.5.1'
+__version__ = '0.5.2'
