From b99b0b491f7b22da27199daf58dc003faae56851 Mon Sep 17 00:00:00 2001 From: Matthieu Dartiailh Date: Fri, 19 Aug 2022 14:25:55 +0200 Subject: [PATCH 1/3] Revert "core: use atom.add_member to add members after a class is defined" This reverts commit d47be167b9182447764940209f967b93362c5f6f. --- enaml/core/compiler_helpers.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/enaml/core/compiler_helpers.py b/enaml/core/compiler_helpers.py index eab442237..ca9de839f 100644 --- a/enaml/core/compiler_helpers.py +++ b/enaml/core/compiler_helpers.py @@ -1,5 +1,5 @@ #------------------------------------------------------------------------------ -# Copyright (c) 2013-2022, Nucleic Development Team. +# Copyright (c) 2013, Nucleic Development Team. # # Distributed under the terms of the Modified BSD License. # @@ -7,7 +7,7 @@ #------------------------------------------------------------------------------ from functools import update_wrapper -from atom.api import Event, Instance, Member, add_member +from atom.api import Event, Instance, Member from atom.datastructures.api import sortedmap from .alias import Alias @@ -154,8 +154,16 @@ def add_storage(node, name, store_type, kind): else: raise RuntimeError("invalid kind '%s'" % kind) + if member is not None: + new.set_index(member.index) + new.copy_static_observers(member) + else: + new.set_index(len(members)) + + new.set_name(name) patch_d_member(new) - add_member(klass, name, new) + members[name] = new + setattr(klass, name, new) def declarative_node(klass, identifier, scope_key, store_locals): From 1f6f16469fddb9e5533943f17bc471f91804fa14 Mon Sep 17 00:00:00 2001 From: Matthieu Dartiailh Date: Fri, 19 Aug 2022 14:26:42 +0200 Subject: [PATCH 2/3] releasenotes: update release notes --- releasenotes.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/releasenotes.rst b/releasenotes.rst index a0e277a72..60bcf1df1 100644 --- a/releasenotes.rst +++ b/releasenotes.rst @@ -5,12 +5,13 @@ Dates are written as DD/MM/YYYY 0.15.2 - unreleased ------------------- +- fix position of popup view when multiple displays are used PR #500 - reimplement DockArea.initialize instead of shadowing the initialized member. PR #502 - require qtpy>=2.1 far Qt backends version PR #501 - qt: use QEvent.Type to coerce new registered event type with all bindings. PR #497 This requires PyQt 6.3.1 to work and allow to eliminate a deprecation warning. - +- fix loading of dock area guide images. PR #503 0.15.1 - 13/06/2022 ------------------- From 0f71fdd5c1906e9de919072cfe921901e6345944 Mon Sep 17 00:00:00 2001 From: Matthieu Dartiailh Date: Fri, 19 Aug 2022 15:54:18 +0200 Subject: [PATCH 3/3] set release date --- releasenotes.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releasenotes.rst b/releasenotes.rst index 60bcf1df1..eee45fc8d 100644 --- a/releasenotes.rst +++ b/releasenotes.rst @@ -3,7 +3,7 @@ Enaml Release Notes Dates are written as DD/MM/YYYY -0.15.2 - unreleased +0.15.2 - 19/08/2022 ------------------- - fix position of popup view when multiple displays are used PR #500 - reimplement DockArea.initialize instead of shadowing the initialized member.