From be306ccc86ba80425d574e502bdfec8eb4b6bba5 Mon Sep 17 00:00:00 2001 From: Thomas Junk Date: Tue, 1 Aug 2017 16:33:20 +0200 Subject: [PATCH 1/9] SQLAlchemy bdist changes --- setup.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 7034893e..0f48fb7a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -23,14 +23,14 @@ requires = python-pyramid-mailer = 0.14.1 python-pyramid-mako python-pyramid-tm - python-sqlalchemy python-transaction python-waitress python-webhelpers - python-zope-sqlalchemy python-xlsxwriter python-psycopg2 pytz + zope.sqlalchemy + SQLAlchemy [nosetests] match=^test From 2281d30f1abe3601a11695354f3cfa4936d96e6b Mon Sep 17 00:00:00 2001 From: Thomas Junk Date: Tue, 1 Aug 2017 16:34:27 +0200 Subject: [PATCH 2/9] Set version to 1.17.1rc1 --- setup.cfg | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index 0f48fb7a..446f57e3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,9 +1,9 @@ [egg_info] -tag_build = +tag_build = rc1 #tag_date = true [bdist_rpm] -release = 1 +release = 0.1.rc1 doc_files = CHANGES.txt LICENSE.txt README.rst development.ini provides = python-ringo requires = diff --git a/setup.py b/setup.py index a1987c2a..dba76779 100644 --- a/setup.py +++ b/setup.py @@ -37,7 +37,7 @@ ] setup(name='ringo', - version = '1.17.0', + version = '1.17.1', description='A simple web framework with base functionality to build web applications.', long_description=README + '\n\n' + CHANGES, classifiers=[ From e1586f5013f2ffdd40928dfd7c6febf0ede77b72 Mon Sep 17 00:00:00 2001 From: Thomas Junk Date: Wed, 2 Aug 2017 12:11:08 +0200 Subject: [PATCH 3/9] Set version to 1.17.1 --- setup.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 446f57e3..0f48fb7a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,9 +1,9 @@ [egg_info] -tag_build = rc1 +tag_build = #tag_date = true [bdist_rpm] -release = 0.1.rc1 +release = 1 doc_files = CHANGES.txt LICENSE.txt README.rst development.ini provides = python-ringo requires = From 7648a4c8a4a0f865697f6954306d212989499feb Mon Sep 17 00:00:00 2001 From: Thomas Junk Date: Wed, 2 Aug 2017 16:42:08 +0200 Subject: [PATCH 4/9] Fixing bewec issues with completed applications. A completed application results in loss of update rights for the user. Hence an authorization error is triggered on successfully completing an application. --- ringo/views/request.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ringo/views/request.py b/ringo/views/request.py index 70cc3e8e..ab6837ea 100644 --- a/ringo/views/request.py +++ b/ringo/views/request.py @@ -329,7 +329,7 @@ def handle_redirect_on_success(request, backurl=None): # the default submittbuttons with no special value we keep the # old behavior. return HTTPFound(location=backurl) - elif request.path.find("/create") > -1: + elif request.path.find("/create") > -1 or request.path.find("/update") > -1: # Handle redirect after success.in case of a create. # Check if the user is allowed to call the url after saving if has_permission("update", item, request): From ad46838932be6eaae6f8bf5527fb01ea15caaddc Mon Sep 17 00:00:00 2001 From: Thomas Junk Date: Wed, 2 Aug 2017 16:56:50 +0200 Subject: [PATCH 5/9] Set version to 1.17.2rc1 --- setup.cfg | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index 0f48fb7a..446f57e3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,9 +1,9 @@ [egg_info] -tag_build = +tag_build = rc1 #tag_date = true [bdist_rpm] -release = 1 +release = 0.1.rc1 doc_files = CHANGES.txt LICENSE.txt README.rst development.ini provides = python-ringo requires = diff --git a/setup.py b/setup.py index dba76779..20163fc1 100644 --- a/setup.py +++ b/setup.py @@ -37,7 +37,7 @@ ] setup(name='ringo', - version = '1.17.1', + version = '1.17.2', description='A simple web framework with base functionality to build web applications.', long_description=README + '\n\n' + CHANGES, classifiers=[ From 576fa5f99749751834c7d65369faf47ddb0c3498 Mon Sep 17 00:00:00 2001 From: Thomas Junk Date: Fri, 4 Aug 2017 08:38:17 +0200 Subject: [PATCH 6/9] Revert "SQLAlchemy bdist changes" This reverts commit be306ccc86ba80425d574e502bdfec8eb4b6bba5. --- setup.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 446f57e3..6a32d058 100644 --- a/setup.cfg +++ b/setup.cfg @@ -23,14 +23,14 @@ requires = python-pyramid-mailer = 0.14.1 python-pyramid-mako python-pyramid-tm + python-sqlalchemy python-transaction python-waitress python-webhelpers + python-zope-sqlalchemy python-xlsxwriter python-psycopg2 pytz - zope.sqlalchemy - SQLAlchemy [nosetests] match=^test From d43ec43bb3213802099af0743f2d68c86e13033e Mon Sep 17 00:00:00 2001 From: Thomas Junk Date: Wed, 16 Aug 2017 15:31:28 +0200 Subject: [PATCH 7/9] Set version to 1.17.1rc2 --- setup.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 6a32d058..5720b7a1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,9 +1,9 @@ [egg_info] -tag_build = rc1 +tag_build = rc2 #tag_date = true [bdist_rpm] -release = 0.1.rc1 +release = 0.1.rc2 doc_files = CHANGES.txt LICENSE.txt README.rst development.ini provides = python-ringo requires = From 5b764d4925dd81426969edae469a5fbea62bb14b Mon Sep 17 00:00:00 2001 From: Thomas Junk Date: Thu, 17 Aug 2017 16:17:39 +0200 Subject: [PATCH 8/9] Set version to 1.17.1 --- setup.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 5720b7a1..7034893e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,9 +1,9 @@ [egg_info] -tag_build = rc2 +tag_build = #tag_date = true [bdist_rpm] -release = 0.1.rc2 +release = 1 doc_files = CHANGES.txt LICENSE.txt README.rst development.ini provides = python-ringo requires = From 32fb517b571b4031a64fd82bb4a86488b7dba142 Mon Sep 17 00:00:00 2001 From: Thomas Junk Date: Sat, 26 Aug 2017 10:00:51 +0200 Subject: [PATCH 9/9] proposal to speedup serialization of models --- ringo/model/base.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/ringo/model/base.py b/ringo/model/base.py index 0973f524..730ae80a 100644 --- a/ringo/model/base.py +++ b/ringo/model/base.py @@ -348,17 +348,9 @@ def get_values(self, include_relations=False, serialized=False): :serialized: Flag if the values should be serialized. :returns: Dictionary with key value pairs. """ - values = {} - for field in get_columns_from_instance(self, include_relations): - # Ignore private form fields - if field.startswith("_"): - continue - if serialized: - value = serialize(getattr(self, field)) - else: - value = getattr(self, field) - values[field] = value - return values + if serialized: + return {k:serialize(v) for k,v in vars(self).items() if not k.startswith("_")} + return {k:v for k,v in vars(self).items() if not k.startswith("_")} def set_values(self, values, use_strict=False): """Will set the values of the item. The values to be set are