diff --git a/ansibleplaybookgrapher/__init__.py b/ansibleplaybookgrapher/__init__.py index ccd20efa..c6b03c0c 100644 --- a/ansibleplaybookgrapher/__init__.py +++ b/ansibleplaybookgrapher/__init__.py @@ -27,8 +27,6 @@ from .graph_model import PlaybookNode, PlayNode, TaskNode, RoleNode, BlockNode from .parser import PlaybookParser -__version__ = "2.1.2" -__prog__ = "ansible-playbook-grapher" display = Display() diff --git a/ansibleplaybookgrapher/cli.py b/ansibleplaybookgrapher/cli.py index acef4571..54f5882c 100644 --- a/ansibleplaybookgrapher/cli.py +++ b/ansibleplaybookgrapher/cli.py @@ -23,7 +23,8 @@ from ansible.release import __version__ as ansible_version from ansible.utils.display import Display -from ansibleplaybookgrapher import __prog__, __version__, Grapher +from ansibleplaybookgrapher import Grapher +from ansibleplaybookgrapher.version import __prog__, __version__ from ansibleplaybookgrapher.renderer import OPEN_PROTOCOL_HANDLERS from ansibleplaybookgrapher.renderer.graphviz import GraphvizRenderer from ansibleplaybookgrapher.renderer.mermaid import ( diff --git a/ansibleplaybookgrapher/version.py b/ansibleplaybookgrapher/version.py new file mode 100644 index 00000000..7bfb507b --- /dev/null +++ b/ansibleplaybookgrapher/version.py @@ -0,0 +1,2 @@ +__version__ = "2.2.0-dev" +__prog__ = "ansible-playbook-grapher" diff --git a/setup.py b/setup.py index 5560d32d..56519d97 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ from setuptools import setup, find_packages -from ansibleplaybookgrapher import __version__, __prog__ +from ansibleplaybookgrapher.version import __version__, __prog__ def read_requirements(path): diff --git a/tests/conftest.py b/tests/conftest.py index c1917a4e..1e940515 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -3,7 +3,7 @@ import pytest from ansible.plugins.loader import init_plugin_loader -from ansibleplaybookgrapher import __prog__ +from ansibleplaybookgrapher.version import __prog__ from ansibleplaybookgrapher.cli import PlaybookGrapherCLI from tests import INVENTORY_FILE, FIXTURES_DIR diff --git a/tests/test_cli.py b/tests/test_cli.py index 93b47471..d3b735d4 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -2,7 +2,7 @@ from ansible.errors import AnsibleOptionsError from ansible.release import __version__ as ansible_version -from ansibleplaybookgrapher import __prog__, __version__ +from ansibleplaybookgrapher.version import __prog__, __version__ from ansibleplaybookgrapher.cli import PlaybookGrapherCLI diff --git a/tests/test_graphviz_renderer.py b/tests/test_graphviz_renderer.py index ebb63679..02c2f68b 100644 --- a/tests/test_graphviz_renderer.py +++ b/tests/test_graphviz_renderer.py @@ -6,7 +6,7 @@ import pytest from pyquery import PyQuery -from ansibleplaybookgrapher import __prog__ +from ansibleplaybookgrapher.version import __prog__ from ansibleplaybookgrapher.cli import PlaybookGrapherCLI from tests import FIXTURES_DIR diff --git a/tests/test_mermaid_renderer.py b/tests/test_mermaid_renderer.py index 346836aa..e522a1cd 100644 --- a/tests/test_mermaid_renderer.py +++ b/tests/test_mermaid_renderer.py @@ -3,7 +3,7 @@ import pytest -from ansibleplaybookgrapher import __prog__ +from ansibleplaybookgrapher.version import __prog__ from ansibleplaybookgrapher.cli import PlaybookGrapherCLI from tests import FIXTURES_DIR