diff options
| author | René 'Necoro' Neumann <necoro@necoro.net> | 2017-03-12 16:27:39 +0100 |
|---|---|---|
| committer | René 'Necoro' Neumann <necoro@necoro.net> | 2017-03-12 16:27:39 +0100 |
| commit | 0ce6f75ac5ca4a51cd916f5450dbd7195e27695d (patch) | |
| tree | a8522a33d412e993bd592333f09f31f3b7bc95a5 | |
| parent | 909f202136fd2f235b923ea2a9c480106d92f517 (diff) | |
| download | archivist-0ce6f75ac5ca4a51cd916f5450dbd7195e27695d.tar.gz archivist-0ce6f75ac5ca4a51cd916f5450dbd7195e27695d.tar.bz2 archivist-0ce6f75ac5ca4a51cd916f5450dbd7195e27695d.zip | |
Upgrade to peewee-2.9.1, remove now fixed workaround
| -rw-r--r-- | archivist/peewee_fixes.py | 14 | ||||
| -rw-r--r-- | setup.py | 4 |
2 files changed, 3 insertions, 15 deletions
diff --git a/archivist/peewee_fixes.py b/archivist/peewee_fixes.py index ff914da..3b9fc2e 100644 --- a/archivist/peewee_fixes.py +++ b/archivist/peewee_fixes.py @@ -1,15 +1,3 @@ -from peewee import QueryCompiler, strip_parens, ForeignKeyField - __all__ = [] -def _parse_select_query(self, node, alias_map, conv): - clone = node.clone() - if not node._explicit_selection: - if conv and isinstance(conv, ForeignKeyField): - clone._select = (conv.to_field,) - else: - clone._select = clone.model_class._meta.get_primary_key_fields() - sub, params = self.generate_select(clone, alias_map) - return '(%s)' % strip_parens(sub), params - -QueryCompiler._parse_select_query = _parse_select_query +# Nothing to fix atm @@ -21,7 +21,7 @@ class build_sqlite_ext(_build_clib): sources = list(sources) log.info("building '%s' library", lib_name) - + macros = build_info.get('macros') include_dirs = build_info.get('include_dirs') objects = self.compiler.compile(sources, @@ -44,7 +44,7 @@ setup( package_data={'archivist' : ['sqlext/*']}, install_requires=[ 'Click>=6.6', - 'peewee>=2.9.0' + 'peewee>=2.9.1' ], entry_points=''' [console_scripts] |