You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by ot...@apache.org on 2020/09/20 17:10:28 UTC
[plc4x] branch feature/plc4py updated: refactor namespace
This is an automated email from the ASF dual-hosted git repository.
otluk pushed a commit to branch feature/plc4py
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/feature/plc4py by this push:
new a3894b6 refactor namespace
new f9ece23 Merge pull request #189 from ottobackwards/namespace-refactor
a3894b6 is described below
commit a3894b609637cd1d3400b1e3d6389ad12233ae97
Author: Otto Fowler <ot...@gmail.com>
AuthorDate: Sun Sep 20 12:19:53 2020 -0400
refactor namespace
---
.../{org/apache/plc4x => }/PlcDriverManager.py | 2 +-
sandbox/plc4py/plc4py/__init__.py | 20 --------------------
.../{org/apache/plc4x => }/api/PlcConnection.py | 0
.../unit/org/apache/plc4x => plc4py/api}/__init__.py | 0
.../org/apache => plc4py/api/exceptions}/__init__.py | 0
.../apache/plc4x => }/api/exceptions/exceptions.py | 0
sandbox/plc4py/plc4py/org/__init__.py | 0
sandbox/plc4py/plc4py/org/apache/__init__.py | 0
sandbox/plc4py/plc4py/org/apache/plc4x/__init__.py | 0
.../plc4py/plc4py/org/apache/plc4x/api/__init__.py | 0
.../org/apache/plc4x/api/exceptions/__init__.py | 0
.../plc4py/tests/unit/{org => plc4py}/__init__.py | 0
.../apache/plc4x => plc4py}/test_PlcDriverManager.py | 4 ++--
13 files changed, 3 insertions(+), 23 deletions(-)
diff --git a/sandbox/plc4py/plc4py/org/apache/plc4x/PlcDriverManager.py b/sandbox/plc4py/plc4py/PlcDriverManager.py
similarity index 94%
rename from sandbox/plc4py/plc4py/org/apache/plc4x/PlcDriverManager.py
rename to sandbox/plc4py/plc4py/PlcDriverManager.py
index 1476d57..28f1788 100644
--- a/sandbox/plc4py/plc4py/org/apache/plc4x/PlcDriverManager.py
+++ b/sandbox/plc4py/plc4py/PlcDriverManager.py
@@ -18,7 +18,7 @@
#
from contextlib import contextmanager
-from plc4py.org.apache.plc4x.api.PlcConnection import PlcConnection
+from plc4py.api.PlcConnection import PlcConnection
class PlcDriverManager:
diff --git a/sandbox/plc4py/plc4py/__init__.py b/sandbox/plc4py/plc4py/__init__.py
index cdaf71a..e69de29 100644
--- a/sandbox/plc4py/plc4py/__init__.py
+++ b/sandbox/plc4py/plc4py/__init__.py
@@ -1,20 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-__version__ = "0.1.0"
diff --git a/sandbox/plc4py/plc4py/org/apache/plc4x/api/PlcConnection.py b/sandbox/plc4py/plc4py/api/PlcConnection.py
similarity index 100%
rename from sandbox/plc4py/plc4py/org/apache/plc4x/api/PlcConnection.py
rename to sandbox/plc4py/plc4py/api/PlcConnection.py
diff --git a/sandbox/plc4py/tests/unit/org/apache/plc4x/__init__.py b/sandbox/plc4py/plc4py/api/__init__.py
similarity index 100%
rename from sandbox/plc4py/tests/unit/org/apache/plc4x/__init__.py
rename to sandbox/plc4py/plc4py/api/__init__.py
diff --git a/sandbox/plc4py/tests/unit/org/apache/__init__.py b/sandbox/plc4py/plc4py/api/exceptions/__init__.py
similarity index 100%
rename from sandbox/plc4py/tests/unit/org/apache/__init__.py
rename to sandbox/plc4py/plc4py/api/exceptions/__init__.py
diff --git a/sandbox/plc4py/plc4py/org/apache/plc4x/api/exceptions/exceptions.py b/sandbox/plc4py/plc4py/api/exceptions/exceptions.py
similarity index 100%
rename from sandbox/plc4py/plc4py/org/apache/plc4x/api/exceptions/exceptions.py
rename to sandbox/plc4py/plc4py/api/exceptions/exceptions.py
diff --git a/sandbox/plc4py/plc4py/org/__init__.py b/sandbox/plc4py/plc4py/org/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/sandbox/plc4py/plc4py/org/apache/__init__.py b/sandbox/plc4py/plc4py/org/apache/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/sandbox/plc4py/plc4py/org/apache/plc4x/__init__.py b/sandbox/plc4py/plc4py/org/apache/plc4x/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/sandbox/plc4py/plc4py/org/apache/plc4x/api/__init__.py b/sandbox/plc4py/plc4py/org/apache/plc4x/api/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/sandbox/plc4py/plc4py/org/apache/plc4x/api/exceptions/__init__.py b/sandbox/plc4py/plc4py/org/apache/plc4x/api/exceptions/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/sandbox/plc4py/tests/unit/org/__init__.py b/sandbox/plc4py/tests/unit/plc4py/__init__.py
similarity index 100%
rename from sandbox/plc4py/tests/unit/org/__init__.py
rename to sandbox/plc4py/tests/unit/plc4py/__init__.py
diff --git a/sandbox/plc4py/tests/unit/org/apache/plc4x/test_PlcDriverManager.py b/sandbox/plc4py/tests/unit/plc4py/test_PlcDriverManager.py
similarity index 92%
rename from sandbox/plc4py/tests/unit/org/apache/plc4x/test_PlcDriverManager.py
rename to sandbox/plc4py/tests/unit/plc4py/test_PlcDriverManager.py
index 689a5f3..e252596 100644
--- a/sandbox/plc4py/tests/unit/org/apache/plc4x/test_PlcDriverManager.py
+++ b/sandbox/plc4py/tests/unit/plc4py/test_PlcDriverManager.py
@@ -19,8 +19,8 @@
from typing import Union
from unittest.mock import MagicMock
-from plc4py.org.apache.plc4x.PlcDriverManager import PlcDriverManager
-from plc4py.org.apache.plc4x.api.PlcConnection import PlcConnection
+from plc4py.PlcDriverManager import PlcDriverManager
+from plc4py.api.PlcConnection import PlcConnection
def test_connection_context_manager_impl_close_called(mocker) -> None: