Skip to content

Conversation

brunobord
Copy link
Contributor

@brunobord brunobord commented Jan 16, 2017

refs #155.

  • reviewable
  • to be autosquashed,

@brunobord
Copy link
Contributor Author

brunobord commented Jan 16, 2017

at the time of writing, here's the diff between this branch and the #156

$ git diff 155-deduplicate_dynamic_form_queryset_rebased deduplicate_dynamic_form_queryset

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index eb118ca..0b91285 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,7 +6,6 @@ master (unreleased)
 ===================
 
 * Added a make target to install the demo site.
-* Added django-perf-rec module for tests and improved SQL queries in `ContextFormDetailView` (#54, #154, #160).
 
 
 Release 0.5.0 (2017-01-10)
diff --git a/demo/demo/settings.py b/demo/demo/settings.py
index 4e0b88d..c85f655 100644
--- a/demo/demo/settings.py
+++ b/demo/demo/settings.py
@@ -128,9 +128,3 @@ FORMIDABLE_POST_CREATE_CALLBACK_SUCCESS = 'demo.callback_success_message'
 FORMIDABLE_POST_UPDATE_CALLBACK_SUCCESS = 'demo.callback_success_message'
 FORMIDABLE_POST_CREATE_CALLBACK_FAIL = 'demo.callback_fail_message'
 FORMIDABLE_POST_UPDATE_CALLBACK_FAIL = 'demo.callback_fail_message'
-
-
-# django-perf-rec settings
-PERF_REC = {
-    'MODE': 'all'
-}
diff --git a/formidable/__init__.py b/formidable/__init__.py
index 96b0a07..d21ec65 100644
--- a/formidable/__init__.py
+++ b/formidable/__init__.py
@@ -1,3 +1 @@
 default_app_config = 'formidable.app.FormidableConfig'
-
-version = '0.6.0.dev0'
diff --git a/setup.py b/setup.py
index 398eb69..d5526df 100644
--- a/setup.py
+++ b/setup.py
@@ -4,15 +4,12 @@ from __future__ import unicode_literals
 import os
 from setuptools import setup, find_packages
 
-import formidable
-
-
 with open(os.path.join(os.path.dirname(__file__), 'README.rst')) as readme:
     README = readme.read()
 
 setup(
     name='django-formidable',
-    version=formidable.version,
+    version='0.6.0.dev0',
     packages=find_packages(),
     include_package_data=True,
     license='BSD License',

which corresponds to the diff introduced by the previous merges of #159 and #160.
It means these branch are finally equivalent, even though I've introduced fixups that mark the evolution of the .yml files generated by django-perf-rec.

Copy link
Contributor

@wo0dyn wo0dyn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks.

@brunobord brunobord force-pushed the 155-deduplicate_dynamic_form_queryset_rebased branch from 40da5d8 to 124720c Compare January 16, 2017 15:49
@brunobord brunobord merged commit f18f1c7 into master Jan 16, 2017
@brunobord brunobord deleted the 155-deduplicate_dynamic_form_queryset_rebased branch January 16, 2017 16:44
brunobord added a commit that referenced this pull request Jan 17, 2017
Changelog

* Added a make target to install the demo site (#152).
* Added django-perf-rec module for tests and improved SQL queries in `ContextFormDetailView` (#54, #154, #160).
* Added test to count queries on dynamic form queryset + improve performances (#155, #156, #162).
* Added test to count queries on retrieve builder view + improve performances by removing duplicate queries (#157, #158, #163).
@brunobord brunobord mentioned this pull request Jan 17, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants