kozorizki/gaphor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change name of etk.docking library to etkdocking to fix import errors

Browse Source 
Signed-off-by: Dan Yeaw <dan@yeaw.me>
This commit is contained in:
Dan Yeaw 2018-10-07 20:44:52 -04:00
parent 49cea54f3e
commit b1a570b1b1
No known key found for this signature in database
GPG Key ID: 77A923EF537B61A4
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gaphor/ui/diagramtab.py
View File

@ -8,7 +8,7 @@ from past.utils import old_div
from gi.repository import Gtk
from cairo import Matrix
from zope import component
from etk.docking import DockItem
from etkdocking import DockItem
from gaphas.view import GtkView
from gaphas.painter import PainterChain, ItemPainter, HandlePainter, \

12
gaphor/ui/layout.py
View File

@ -1,22 +1,22 @@
# -*- coding: utf-8 -*-
# vim:sw=4:et:ai
# Copyright © 2010 etk.docking Contributors
# Copyright © 2010 etkdocking Contributors
#
# This file is part of etk.docking.
# This file is part of etkdocking.
#
# etk.docking is free software: you can redistribute it and/or modify
# etkdocking is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# etk.docking is distributed in the hope that it will be useful,
# etkdocking is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with etk.docking. If not, see <http://www.gnu.org/licenses/>.
# along with etkdocking. If not, see <http://www.gnu.org/licenses/>.
from __future__ import absolute_import
@ -31,7 +31,7 @@ from xml.etree.ElementTree import Element, SubElement, tostring, fromstring
from gi.repository import Gtk
from etk.docking import DockFrame, DockPaned, DockGroup, DockItem
from etkdocking import DockFrame, DockPaned, DockGroup, DockItem
from gaphor.core import _
SERIALIZABLE = ( DockFrame, DockPaned, DockGroup, DockItem )

10
gaphor/ui/mainwindow.py
View File

@ -11,11 +11,11 @@ from zope import component
from gi.repository import GObject
from gi.repository import Gtk
import pkg_resources
from etk.docking import DockItem, DockGroup
from etk.docking import DockLayout
from etk.docking import add_new_group_above, add_new_group_below, add_new_group_floating
from etk.docking import add_new_group_left, add_new_group_right
from etk.docking import settings
from etkdocking import DockItem, DockGroup
from etkdocking import DockLayout
from etkdocking.docklayout import add_new_group_above, add_new_group_below, add_new_group_floating
from etkdocking.docklayout import add_new_group_left, add_new_group_right
from etkdocking import settings
from zope.interface import implementer
from gaphor import UML

5
setup.py
View File

@ -83,9 +83,10 @@ It uses the GTK+ environment for user interaction.
include_package_data = True,
install_requires = [
# 'PyGTK >= 2.8.0', - Exclude, since it will not build anyway
'pycairo >= 1.17.0',
'PyGObject >= 3.30.0',
'gaphas >= 0.7.2',
'etk.docking >= 0.2',
'etkdocking >= 0.2',
'zope.component >= 3.4.0', # - won't compile on windows.
'future >= 0.16.0',
],