Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move core modelling concepts to a separate package #295

Merged
merged 15 commits into from
Apr 10, 2020
Merged

Move core modelling concepts to a separate package #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1382fb6
Change gaphor.core to a package
amolenaar Apr 8, 2020
f4591d7
Move ElementFactory to gaphor.core.modeling
amolenaar Apr 8, 2020
f84d7b8
Move EventManager to gaphor.core
amolenaar Apr 8, 2020
6ad184a
Move Element and friends to gaphor.core.modeling
amolenaar Apr 8, 2020
405ae0b
move Presentation to gaphor.core.modeling
amolenaar Apr 9, 2020
b6cbf2b
Remove duplicate toolbox actions for UML
amolenaar Apr 9, 2020
f9a0ec6
Move diagram module to core.modeling
amolenaar Apr 9, 2020
d558176
Do no longer define Presentation in UML model
amolenaar Apr 9, 2020
27b41e0
Build out core model
amolenaar Apr 9, 2020
f2978df
Move UML model files to models/ folder
amolenaar Apr 9, 2020
e9fec2e
Reference Diagram and Element from core.modeling
amolenaar Apr 9, 2020
b73d001
Disable doctest again
amolenaar Apr 9, 2020
64635e9
Improve storage test naming
amolenaar Apr 10, 2020
6b011f3
Make types more explicit
amolenaar Apr 10, 2020
476e773
Clean up model build files
amolenaar Apr 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,12 @@ icons: ## Generate icons from stensil (requires Inkscape)
translate: ## Translate and update .po and .mo files (requires PyBabel)
$(MAKE) -C po

model: gaphor/UML/uml2.py ## Generate Python model files from Gaphor models (requires Black, MyPy)
model: gaphor/core/modeling/coremodel.py gaphor/UML/uml2.py ## Generate Python model files from Gaphor models (requires Black, MyPy)

gaphor/UML/uml2.py: gaphor/UML/uml2.gaphor gaphor/UML/uml2.override utils/model/gen_uml.py utils/model/override.py utils/model/writer.py
gaphor/core/modeling/coremodel.py: models/Core.gaphor models/Core.override utils/model/gen_uml.py utils/model/override.py utils/model/writer.py
utils/model/build_core.py && black $@ && mypy gaphor/core/modeling

gaphor/UML/uml2.py: models/UML.gaphor models/UML.override utils/model/gen_uml.py utils/model/override.py utils/model/writer.py
utils/model/build_uml.py && black $@ && mypy gaphor/UML

.PHONY: help dist test docs icons translate model
2 changes: 1 addition & 1 deletion docs/datamodel.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,5 +84,5 @@ screen by a `DiagramView` class.
## UML.Element

```eval_rst
.. autoclass:: gaphor.UML.element.Element
.. autoclass:: gaphor.core.modeling.Element
```
2 changes: 1 addition & 1 deletion docs/services.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ emitted are with `UML.Elements`. Those classes, or more specifically, the
properties, send notifications every time their state changes.

```eval_rst
.. autoclass:: gaphor.UML.elementfactory.ElementFactory
.. autoclass:: gaphor.core.modeling.ElementFactory
```

## Plugins
Expand Down
2 changes: 0 additions & 2 deletions gaphor/UML/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Here, order matters
from gaphor.UML.uml2 import * # noqa: isort:skip
from gaphor.UML.presentation import Presentation # noqa: isort:skip
from gaphor.UML.elementfactory import ElementFactory # noqa: isort:skip
from gaphor.UML import modelfactory as model # noqa: isort:skip

from gaphor.UML.umlfmt import format
Expand Down
61 changes: 0 additions & 61 deletions gaphor/UML/diagram.py
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions gaphor/UML/tests/test_modelfactory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import pytest

from gaphor import UML
from gaphor.services.eventmanager import EventManager
from gaphor.core.eventmanager import EventManager
from gaphor.core.modeling import ElementFactory


@pytest.fixture
def factory():
event_manager = EventManager()
return UML.ElementFactory(event_manager)
return ElementFactory(event_manager)


def test_stereotype_name(factory):
Expand Down
5 changes: 3 additions & 2 deletions gaphor/UML/tests/test_uml2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import pytest

import gaphor.UML as UML
from gaphor.services.eventmanager import EventManager
from gaphor.core.eventmanager import EventManager
from gaphor.core.modeling import ElementFactory


@pytest.fixture
def factory():
event_manager = EventManager()
return UML.ElementFactory(event_manager)
return ElementFactory(event_manager)


def test_association(factory):
Expand Down
4 changes: 2 additions & 2 deletions gaphor/UML/tests/test_umlfmt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import pytest

import gaphor.UML.uml2 as UML
from gaphor.services.eventmanager import EventManager
from gaphor.core.eventmanager import EventManager
from gaphor.core.modeling import ElementFactory
from gaphor.UML import model
from gaphor.UML.elementfactory import ElementFactory
from gaphor.UML.umlfmt import format
from gaphor.UML.umllex import parse

Expand Down
4 changes: 2 additions & 2 deletions gaphor/UML/tests/test_umllex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import pytest

from gaphor import UML
from gaphor.services.eventmanager import EventManager
from gaphor.UML.elementfactory import ElementFactory
from gaphor.core.eventmanager import EventManager
from gaphor.core.modeling import ElementFactory
from gaphor.UML.umllex import attribute_pat, operation_pat, parameter_pat


Expand Down