From 1931020bb1b5d1c1dc100db0c0daccd395ef0792 Mon Sep 17 00:00:00 2001 From: Andrei Bondarenko Date: Sat, 24 Jul 2021 21:50:12 +0200 Subject: [PATCH] Revert "Reorganization" This reverts commit f44c888a --- services/bottom/test/__init__.py | 0 services/bottom/test/fixtures/__init__.py | 0 {core => state}/__init__.py | 0 {services/bottom => state}/base.py | 0 {services/bottom => state}/devstate.py | 2 +- {services/bottom => state}/pystate.py | 2 +- {services => state/test}/__init__.py | 0 {services/bottom => state}/test/conftest.py | 0 {services/bottom => state/test/fixtures}/__init__.py | 0 {services/bottom => state}/test/fixtures/state.py | 2 +- {services/bottom => state}/test/test_create_dict.py | 0 {services/bottom => state}/test/test_create_edge.py | 0 {services/bottom => state}/test/test_create_node.py | 0 {services/bottom => state}/test/test_create_nodevalue.py | 0 {services/bottom => state}/test/test_delete_edge.py | 0 {services/bottom => state}/test/test_delete_node.py | 0 {services/bottom => state}/test/test_read_dict.py | 0 {services/bottom => state}/test/test_read_dict_edge.py | 0 {services/bottom => state}/test/test_read_dict_keys.py | 0 {services/bottom => state}/test/test_read_dict_node.py | 0 {services/bottom => state}/test/test_read_edge.py | 0 {services/bottom => state}/test/test_read_incoming.py | 0 {services/bottom => state}/test/test_read_outgoing.py | 0 {services/bottom => state}/test/test_read_reverse_dict.py | 0 {services/bottom => state}/test/test_read_value.py | 0 25 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 services/bottom/test/__init__.py delete mode 100644 services/bottom/test/fixtures/__init__.py rename {core => state}/__init__.py (100%) rename {services/bottom => state}/base.py (100%) rename {services/bottom => state}/devstate.py (97%) rename {services/bottom => state}/pystate.py (99%) rename {services => state/test}/__init__.py (100%) rename {services/bottom => state}/test/conftest.py (100%) rename {services/bottom => state/test/fixtures}/__init__.py (100%) rename {services/bottom => state}/test/fixtures/state.py (90%) rename {services/bottom => state}/test/test_create_dict.py (100%) rename {services/bottom => state}/test/test_create_edge.py (100%) rename {services/bottom => state}/test/test_create_node.py (100%) rename {services/bottom => state}/test/test_create_nodevalue.py (100%) rename {services/bottom => state}/test/test_delete_edge.py (100%) rename {services/bottom => state}/test/test_delete_node.py (100%) rename {services/bottom => state}/test/test_read_dict.py (100%) rename {services/bottom => state}/test/test_read_dict_edge.py (100%) rename {services/bottom => state}/test/test_read_dict_keys.py (100%) rename {services/bottom => state}/test/test_read_dict_node.py (100%) rename {services/bottom => state}/test/test_read_edge.py (100%) rename {services/bottom => state}/test/test_read_incoming.py (100%) rename {services/bottom => state}/test/test_read_outgoing.py (100%) rename {services/bottom => state}/test/test_read_reverse_dict.py (100%) rename {services/bottom => state}/test/test_read_value.py (100%) diff --git a/services/bottom/test/__init__.py b/services/bottom/test/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/services/bottom/test/fixtures/__init__.py b/services/bottom/test/fixtures/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/core/__init__.py b/state/__init__.py similarity index 100% rename from core/__init__.py rename to state/__init__.py diff --git a/services/bottom/base.py b/state/base.py similarity index 100% rename from services/bottom/base.py rename to state/base.py diff --git a/services/bottom/devstate.py b/state/devstate.py similarity index 97% rename from services/bottom/devstate.py rename to state/devstate.py index 65d4357..798d8d9 100644 --- a/services/bottom/devstate.py +++ b/state/devstate.py @@ -1,4 +1,4 @@ -from services.bottom.pystate import PyState +from state.pystate import PyState class DevState(PyState): diff --git a/services/bottom/pystate.py b/state/pystate.py similarity index 99% rename from services/bottom/pystate.py rename to state/pystate.py index 8f306ec..b88a358 100644 --- a/services/bottom/pystate.py +++ b/state/pystate.py @@ -1,6 +1,6 @@ from typing import Any, List, Tuple, Optional -from services.bottom.base import State, Node, Edge, Element +from state.base import State, Node, Edge, Element class PyState(State): diff --git a/services/__init__.py b/state/test/__init__.py similarity index 100% rename from services/__init__.py rename to state/test/__init__.py diff --git a/services/bottom/test/conftest.py b/state/test/conftest.py similarity index 100% rename from services/bottom/test/conftest.py rename to state/test/conftest.py diff --git a/services/bottom/__init__.py b/state/test/fixtures/__init__.py similarity index 100% rename from services/bottom/__init__.py rename to state/test/fixtures/__init__.py diff --git a/services/bottom/test/fixtures/state.py b/state/test/fixtures/state.py similarity index 90% rename from services/bottom/test/fixtures/state.py rename to state/test/fixtures/state.py index 6dcb16e..ab7eb87 100644 --- a/services/bottom/test/fixtures/state.py +++ b/state/test/fixtures/state.py @@ -1,5 +1,5 @@ import pytest -from services.bottom.pystate import PyState +from state.pystate import PyState # from state.rdfstate import RDFState # from state.neo4jstate import Neo4jState diff --git a/services/bottom/test/test_create_dict.py b/state/test/test_create_dict.py similarity index 100% rename from services/bottom/test/test_create_dict.py rename to state/test/test_create_dict.py diff --git a/services/bottom/test/test_create_edge.py b/state/test/test_create_edge.py similarity index 100% rename from services/bottom/test/test_create_edge.py rename to state/test/test_create_edge.py diff --git a/services/bottom/test/test_create_node.py b/state/test/test_create_node.py similarity index 100% rename from services/bottom/test/test_create_node.py rename to state/test/test_create_node.py diff --git a/services/bottom/test/test_create_nodevalue.py b/state/test/test_create_nodevalue.py similarity index 100% rename from services/bottom/test/test_create_nodevalue.py rename to state/test/test_create_nodevalue.py diff --git a/services/bottom/test/test_delete_edge.py b/state/test/test_delete_edge.py similarity index 100% rename from services/bottom/test/test_delete_edge.py rename to state/test/test_delete_edge.py diff --git a/services/bottom/test/test_delete_node.py b/state/test/test_delete_node.py similarity index 100% rename from services/bottom/test/test_delete_node.py rename to state/test/test_delete_node.py diff --git a/services/bottom/test/test_read_dict.py b/state/test/test_read_dict.py similarity index 100% rename from services/bottom/test/test_read_dict.py rename to state/test/test_read_dict.py diff --git a/services/bottom/test/test_read_dict_edge.py b/state/test/test_read_dict_edge.py similarity index 100% rename from services/bottom/test/test_read_dict_edge.py rename to state/test/test_read_dict_edge.py diff --git a/services/bottom/test/test_read_dict_keys.py b/state/test/test_read_dict_keys.py similarity index 100% rename from services/bottom/test/test_read_dict_keys.py rename to state/test/test_read_dict_keys.py diff --git a/services/bottom/test/test_read_dict_node.py b/state/test/test_read_dict_node.py similarity index 100% rename from services/bottom/test/test_read_dict_node.py rename to state/test/test_read_dict_node.py diff --git a/services/bottom/test/test_read_edge.py b/state/test/test_read_edge.py similarity index 100% rename from services/bottom/test/test_read_edge.py rename to state/test/test_read_edge.py diff --git a/services/bottom/test/test_read_incoming.py b/state/test/test_read_incoming.py similarity index 100% rename from services/bottom/test/test_read_incoming.py rename to state/test/test_read_incoming.py diff --git a/services/bottom/test/test_read_outgoing.py b/state/test/test_read_outgoing.py similarity index 100% rename from services/bottom/test/test_read_outgoing.py rename to state/test/test_read_outgoing.py diff --git a/services/bottom/test/test_read_reverse_dict.py b/state/test/test_read_reverse_dict.py similarity index 100% rename from services/bottom/test/test_read_reverse_dict.py rename to state/test/test_read_reverse_dict.py diff --git a/services/bottom/test/test_read_value.py b/state/test/test_read_value.py similarity index 100% rename from services/bottom/test/test_read_value.py rename to state/test/test_read_value.py