diff --git a/Makefile b/Makefile
index 7d4c77c2..98cc9e8f 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
# Makefile for subiquity
#
NAME=subiquity
-VERSION=$(shell python3 -c "import subiquity; print(subiquity.__version__)")
+VERSION=$(shell python3 -c "import subiquitycore; print(subiquitycore.__version__)")
PYTHONSRC=$(NAME)
PYTHONPATH=$(shell pwd):$(shell pwd)/probert
VENVPATH=$(shell pwd)/venv
diff --git a/bin/subiquity-tui b/bin/subiquity-tui
index b20b38db..8b30de33 100755
--- a/bin/subiquity-tui
+++ b/bin/subiquity-tui
@@ -18,12 +18,12 @@ import argparse
import sys
import logging
import signal
-from subiquity.log import setup_logger, LOGFILE
-from subiquity import __version__ as VERSION
-from subiquity.core import Controller as Subiquity
-from subiquity.core import CoreControllerError
-from subiquity.ui.frame import SubiquityUI
-from subiquity.utils import environment_check
+from subiquitycore.log import setup_logger, LOGFILE
+from subiquitycore import __version__ as VERSION
+from subiquitycore.core import Controller as Subiquity
+from subiquitycore.core import CoreControllerError
+from subiquitycore.ui.frame import SubiquityUI
+from subiquitycore.utils import environment_check
def parse_options(argv):
diff --git a/subiquity/__init__.py b/subiquitycore/__init__.py
similarity index 97%
rename from subiquity/__init__.py
rename to subiquitycore/__init__.py
index 6e7ce7e1..fd227128 100644
--- a/subiquity/__init__.py
+++ b/subiquitycore/__init__.py
@@ -13,6 +13,6 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see .
-""" Subiquity """
+""" SubiquityCore """
__version__ = "0.0.5"
diff --git a/subiquity/async.py b/subiquitycore/async.py
similarity index 96%
rename from subiquity/async.py
rename to subiquitycore/async.py
index 480bf0db..fdb04a6e 100644
--- a/subiquity/async.py
+++ b/subiquitycore/async.py
@@ -38,7 +38,7 @@ The way this works is you create your non-blocking thread:
import logging
from concurrent.futures import ThreadPoolExecutor
-log = logging.getLogger("subiquity.async")
+log = logging.getLogger("subiquitycore.async")
class Async:
diff --git a/subiquity/controller.py b/subiquitycore/controller.py
similarity index 96%
rename from subiquity/controller.py
rename to subiquitycore/controller.py
index 5561e7ce..95f6cb89 100644
--- a/subiquity/controller.py
+++ b/subiquitycore/controller.py
@@ -18,7 +18,7 @@
import logging
-log = logging.getLogger("subiquity.controller")
+log = logging.getLogger("subiquitycore.controller")
class ControllerPolicyException(Exception):
diff --git a/subiquity/controllers/__init__.py b/subiquitycore/controllers/__init__.py
similarity index 100%
rename from subiquity/controllers/__init__.py
rename to subiquitycore/controllers/__init__.py
diff --git a/subiquity/controllers/ceph.py b/subiquitycore/controllers/ceph.py
similarity index 86%
rename from subiquity/controllers/ceph.py
rename to subiquitycore/controllers/ceph.py
index 9f21942d..ec3c5ebc 100644
--- a/subiquity/controllers/ceph.py
+++ b/subiquitycore/controllers/ceph.py
@@ -14,10 +14,10 @@
# along with this program. If not, see .
import logging
-from subiquity.models import CephDiskModel
-from subiquity.controller import ControllerPolicy
+from subiquitycore.models import CephDiskModel
+from subiquitycore.controller import ControllerPolicy
-log = logging.getLogger("subiquity.controller.ceph")
+log = logging.getLogger("subiquitycore.controller.ceph")
class CephDiskController(ControllerPolicy):
diff --git a/subiquity/controllers/filesystem.py b/subiquitycore/controllers/filesystem.py
similarity index 94%
rename from subiquity/controllers/filesystem.py
rename to subiquitycore/controllers/filesystem.py
index 8cf2c71e..62e1da02 100644
--- a/subiquity/controllers/filesystem.py
+++ b/subiquitycore/controllers/filesystem.py
@@ -15,21 +15,21 @@
import logging
import os
-from subiquity.controller import ControllerPolicy
-from subiquity.models.actions import preserve_action
-from subiquity.models import (FilesystemModel, RaidModel)
-from subiquity.models.filesystem import (_humanize_size)
-from subiquity.ui.views import (DiskPartitionView, AddPartitionView,
- AddFormatView, FilesystemView,
- DiskInfoView, RaidView, BcacheView,
- LVMVolumeGroupView)
-from subiquity.ui.dummy import DummyView
-from subiquity.ui.error import ErrorView
-from subiquity.curtin import (curtin_write_storage_actions,
- curtin_write_preserved_actions)
+from subiquitycore.controller import ControllerPolicy
+from subiquitycore.models.actions import preserve_action
+from subiquitycore.models import (FilesystemModel, RaidModel)
+from subiquitycore.models.filesystem import (_humanize_size)
+from subiquitycore.ui.views import (DiskPartitionView, AddPartitionView,
+ AddFormatView, FilesystemView,
+ DiskInfoView, RaidView, BcacheView,
+ LVMVolumeGroupView)
+from subiquitycore.ui.dummy import DummyView
+from subiquitycore.ui.error import ErrorView
+from subiquitycore.curtin import (curtin_write_storage_actions,
+ curtin_write_preserved_actions)
-log = logging.getLogger("subiquity.controller.filesystem")
+log = logging.getLogger("subiquitycore.controller.filesystem")
BIOS_GRUB_SIZE_BYTES = 2 * 1024 * 1024 # 2MiB
UEFI_GRUB_SIZE_BYTES = 512 * 1024 * 1024 # 512MiB EFI partition
diff --git a/subiquity/controllers/identity.py b/subiquitycore/controllers/identity.py
similarity index 88%
rename from subiquity/controllers/identity.py
rename to subiquitycore/controllers/identity.py
index d0f011f7..47c23167 100644
--- a/subiquity/controllers/identity.py
+++ b/subiquitycore/controllers/identity.py
@@ -14,11 +14,11 @@
# along with this program. If not, see .
import logging
-from subiquity.controller import ControllerPolicy
-from subiquity.models import IdentityModel
-from subiquity.ui.views import IdentityView, LoginView
+from subiquitycore.controller import ControllerPolicy
+from subiquitycore.models import IdentityModel
+from subiquitycore.ui.views import IdentityView, LoginView
-log = logging.getLogger('subiquity.controllers.identity')
+log = logging.getLogger('subiquitycore.controllers.identity')
class IdentityController(ControllerPolicy):
def __init__(self, common):
diff --git a/subiquity/controllers/installpath.py b/subiquitycore/controllers/installpath.py
similarity index 90%
rename from subiquity/controllers/installpath.py
rename to subiquitycore/controllers/installpath.py
index 661b1900..5d8e00cb 100644
--- a/subiquity/controllers/installpath.py
+++ b/subiquitycore/controllers/installpath.py
@@ -14,10 +14,10 @@
# along with this program. If not, see .
import logging
-from subiquity.controller import ControllerPolicy
-from subiquity.models import InstallpathModel
-from subiquity.ui.views import InstallpathView
-from subiquity.ui.dummy import DummyView
+from subiquitycore.controller import ControllerPolicy
+from subiquitycore.models import InstallpathModel
+from subiquitycore.ui.views import InstallpathView
+from subiquitycore.ui.dummy import DummyView
log = logging.getLogger('subiquity.controller.installpath')
diff --git a/subiquity/controllers/installprogress.py b/subiquitycore/controllers/installprogress.py
similarity index 94%
rename from subiquity/controllers/installprogress.py
rename to subiquitycore/controllers/installprogress.py
index 99eb6811..4dec813f 100644
--- a/subiquity/controllers/installprogress.py
+++ b/subiquitycore/controllers/installprogress.py
@@ -17,18 +17,18 @@ import logging
import os
import subprocess
from tornado.gen import coroutine
-import subiquity.utils as utils
-from subiquity.models import InstallProgressModel
-from subiquity.ui.views import ProgressView
-from subiquity.controller import ControllerPolicy
-from subiquity.curtin import (CURTIN_CONFIGS,
- CURTIN_INSTALL_LOG,
- CURTIN_POSTINSTALL_LOG,
- curtin_reboot,
- curtin_install_cmd)
+import subiquitycore.utils as utils
+from subiquitycore.models import InstallProgressModel
+from subiquitycore.ui.views import ProgressView
+from subiquitycore.controller import ControllerPolicy
+from subiquitycore.curtin import (CURTIN_CONFIGS,
+ CURTIN_INSTALL_LOG,
+ CURTIN_POSTINSTALL_LOG,
+ curtin_reboot,
+ curtin_install_cmd)
-log = logging.getLogger("subiquity.controller.installprogress")
+log = logging.getLogger("subiquitycore.controller.installprogress")
class InstallProgressController(ControllerPolicy):
diff --git a/subiquity/controllers/iscsi.py b/subiquitycore/controllers/iscsi.py
similarity index 87%
rename from subiquity/controllers/iscsi.py
rename to subiquitycore/controllers/iscsi.py
index 9639dbd3..92f47282 100644
--- a/subiquity/controllers/iscsi.py
+++ b/subiquitycore/controllers/iscsi.py
@@ -14,10 +14,10 @@
# along with this program. If not, see .
import logging
-from subiquity.models import IscsiDiskModel
-from subiquity.controller import ControllerPolicy
+from subiquitycore.models import IscsiDiskModel
+from subiquitycore.controller import ControllerPolicy
-log = logging.getLogger("subiquity.controller.iscsi")
+log = logging.getLogger("subiquitycore.controller.iscsi")
class IscsiDiskController(ControllerPolicy):
diff --git a/subiquity/controllers/login.py b/subiquitycore/controllers/login.py
similarity index 88%
rename from subiquity/controllers/login.py
rename to subiquitycore/controllers/login.py
index e496e4f4..3cd29ce1 100644
--- a/subiquity/controllers/login.py
+++ b/subiquitycore/controllers/login.py
@@ -14,9 +14,9 @@
# along with this program. If not, see .
-from subiquity.ui.views import LoginView
-from subiquity.models import LoginModel
-from subiquity.controller import ControllerPolicy
+from subiquitycore.ui.views import LoginView
+from subiquitycore.models import LoginModel
+from subiquitycore.controller import ControllerPolicy
class LoginController(ControllerPolicy):
diff --git a/subiquity/controllers/network.py b/subiquitycore/controllers/network.py
similarity index 84%
rename from subiquity/controllers/network.py
rename to subiquitycore/controllers/network.py
index a0b0a3d8..d0cbf6d4 100644
--- a/subiquity/controllers/network.py
+++ b/subiquitycore/controllers/network.py
@@ -14,19 +14,19 @@
# along with this program. If not, see .
import logging
-from subiquity.controller import ControllerPolicy
-from subiquity.models import NetworkModel
-from subiquity.ui.views import (NetworkView,
- NetworkSetDefaultRouteView,
- NetworkBondInterfacesView,
- NetworkConfigureInterfaceView,
- NetworkConfigureIPv4InterfaceView)
-from subiquity.ui.dummy import DummyView
+from subiquitycore.controller import ControllerPolicy
+from subiquitycore.models import NetworkModel
+from subiquitycore.ui.views import (NetworkView,
+ NetworkSetDefaultRouteView,
+ NetworkBondInterfacesView,
+ NetworkConfigureInterfaceView,
+ NetworkConfigureIPv4InterfaceView)
+from subiquitycore.ui.dummy import DummyView
-from subiquity.curtin import curtin_write_network_actions
-from subiquity.curtin import curtin_apply_networking
+from subiquitycore.curtin import curtin_write_network_actions
+from subiquitycore.curtin import curtin_apply_networking
-log = logging.getLogger("subiquity.controller.network")
+log = logging.getLogger("subiquitycore.controller.network")
class NetworkController(ControllerPolicy):
diff --git a/subiquity/controllers/raid.py b/subiquitycore/controllers/raid.py
similarity index 85%
rename from subiquity/controllers/raid.py
rename to subiquitycore/controllers/raid.py
index 8c324788..5490d367 100644
--- a/subiquity/controllers/raid.py
+++ b/subiquitycore/controllers/raid.py
@@ -14,10 +14,10 @@
# along with this program. If not, see .
import logging
-from subiquity.models import RaidDiskModel
-from subiquity.controller import ControllerPolicy
+from subiquitycore.models import RaidDiskModel
+from subiquitycore.controller import ControllerPolicy
-log = logging.getLogger("subiquity.controller.raid")
+log = logging.getLogger("subiquitycore.controller.raid")
class RaidDiskController(ControllerPolicy):
diff --git a/subiquity/controllers/welcome.py b/subiquitycore/controllers/welcome.py
similarity index 89%
rename from subiquity/controllers/welcome.py
rename to subiquitycore/controllers/welcome.py
index 9185d0f2..9643344f 100644
--- a/subiquity/controllers/welcome.py
+++ b/subiquitycore/controllers/welcome.py
@@ -14,9 +14,9 @@
# along with this program. If not, see .
-from subiquity.ui.views import WelcomeView
-from subiquity.models import WelcomeModel
-from subiquity.controller import ControllerPolicy
+from subiquitycore.ui.views import WelcomeView
+from subiquitycore.models import WelcomeModel
+from subiquitycore.controller import ControllerPolicy
class WelcomeController(ControllerPolicy):
diff --git a/subiquity/core.py b/subiquitycore/core.py
similarity index 94%
rename from subiquity/core.py
rename to subiquitycore/core.py
index c28cb696..23c271da 100644
--- a/subiquity/core.py
+++ b/subiquitycore/core.py
@@ -17,11 +17,11 @@ import logging
import urwid
from tornado.ioloop import IOLoop
from tornado.util import import_object
-from subiquity.signals import Signal
-from subiquity.palette import STYLES, STYLES_MONO
-from subiquity.prober import Prober, ProberException
+from subiquitycore.signals import Signal
+from subiquitycore.palette import STYLES, STYLES_MONO
+from subiquitycore.prober import Prober, ProberException
-log = logging.getLogger('subiquity.core')
+log = logging.getLogger('subiquitycore.core')
class CoreControllerError(Exception):
@@ -118,7 +118,7 @@ class Controller:
for k in self.controllers.keys():
log.debug("Importing controller: {}".format(k))
klass = import_object(
- "subiquity.controllers.{}Controller".format(
+ "subiquitycore.controllers.{}Controller".format(
k))
self.controllers[k] = klass(self.common)
diff --git a/subiquity/curtin.py b/subiquitycore/curtin.py
similarity index 99%
rename from subiquity/curtin.py
rename to subiquitycore/curtin.py
index 6c55dbc6..dff25b1c 100644
--- a/subiquity/curtin.py
+++ b/subiquitycore/curtin.py
@@ -19,10 +19,10 @@ import os
import subprocess
import time
import yaml
-import subiquity.utils as utils
+import subiquitycore.utils as utils
-log = logging.getLogger("subiquity.curtin")
+log = logging.getLogger("subiquitycore.curtin")
TMPDIR = '/tmp'
CURTIN_SEARCH_PATH = ['/usr/local/curtin/bin', '/usr/bin']
diff --git a/subiquity/log.py b/subiquitycore/log.py
similarity index 100%
rename from subiquity/log.py
rename to subiquitycore/log.py
diff --git a/subiquity/meta.py b/subiquitycore/meta.py
similarity index 100%
rename from subiquity/meta.py
rename to subiquitycore/meta.py
diff --git a/subiquity/model.py b/subiquitycore/model.py
similarity index 100%
rename from subiquity/model.py
rename to subiquitycore/model.py
diff --git a/subiquity/models/__init__.py b/subiquitycore/models/__init__.py
similarity index 100%
rename from subiquity/models/__init__.py
rename to subiquitycore/models/__init__.py
diff --git a/subiquity/models/actions.py b/subiquitycore/models/actions.py
similarity index 100%
rename from subiquity/models/actions.py
rename to subiquitycore/models/actions.py
diff --git a/subiquity/models/blockdev.py b/subiquitycore/models/blockdev.py
similarity index 99%
rename from subiquity/models/blockdev.py
rename to subiquitycore/models/blockdev.py
index dc38294f..3926f487 100644
--- a/subiquity/models/blockdev.py
+++ b/subiquitycore/models/blockdev.py
@@ -29,7 +29,7 @@ from .actions import (
RaidAction,
)
-log = logging.getLogger("subiquity.filesystem.blockdev")
+log = logging.getLogger("subiquitycore.filesystem.blockdev")
FIRST_PARTITION_OFFSET = 1 << 20 # 1K offset/aligned
GPT_END_RESERVE = 1 << 20 # save room at the end for GPT
diff --git a/subiquity/models/ceph_disk.py b/subiquitycore/models/ceph_disk.py
similarity index 94%
rename from subiquity/models/ceph_disk.py
rename to subiquitycore/models/ceph_disk.py
index 1d31a8f8..a41ba251 100644
--- a/subiquity/models/ceph_disk.py
+++ b/subiquitycore/models/ceph_disk.py
@@ -15,10 +15,10 @@
import logging
-from subiquity.model import ModelPolicy
+from subiquitycore.model import ModelPolicy
-log = logging.getLogger('subiquity.models.ceph_disk')
+log = logging.getLogger('subiquitycore.models.ceph_disk')
class CephDiskModel(ModelPolicy):
diff --git a/subiquity/models/filesystem.py b/subiquitycore/models/filesystem.py
similarity index 99%
rename from subiquity/models/filesystem.py
rename to subiquitycore/models/filesystem.py
index 3c827065..a921c74d 100644
--- a/subiquity/models/filesystem.py
+++ b/subiquitycore/models/filesystem.py
@@ -24,11 +24,11 @@ from .blockdev import (Bcachedev,
Raiddev,
sort_actions)
import math
-from subiquity.model import ModelPolicy
+from subiquitycore.model import ModelPolicy
HUMAN_UNITS = ['B', 'K', 'M', 'G', 'T', 'P']
-log = logging.getLogger('subiquity.models.filesystem')
+log = logging.getLogger('subiquitycore.models.filesystem')
class AttrDict(dict):
diff --git a/subiquity/models/identity.py b/subiquitycore/models/identity.py
similarity index 94%
rename from subiquity/models/identity.py
rename to subiquitycore/models/identity.py
index 6fccec9a..cf4b2276 100644
--- a/subiquity/models/identity.py
+++ b/subiquitycore/models/identity.py
@@ -14,11 +14,11 @@
# along with this program. If not, see .
import logging
-from subiquity.model import ModelPolicy
-from subiquity.utils import crypt_password
+from subiquitycore.model import ModelPolicy
+from subiquitycore.utils import crypt_password
-log = logging.getLogger('subiquity.models.identity')
+log = logging.getLogger('subiquitycore.models.identity')
class LocalUser(object):
def __init__(self, result):
diff --git a/subiquity/models/installpath.py b/subiquitycore/models/installpath.py
similarity index 94%
rename from subiquity/models/installpath.py
rename to subiquitycore/models/installpath.py
index a2b7c96e..0349c943 100644
--- a/subiquity/models/installpath.py
+++ b/subiquitycore/models/installpath.py
@@ -14,10 +14,10 @@
# along with this program. If not, see .
import logging
-from subiquity.model import ModelPolicy
+from subiquitycore.model import ModelPolicy
-log = logging.getLogger("subiquity.models.installpath")
+log = logging.getLogger("subiquitycore.models.installpath")
class InstallpathModel(ModelPolicy):
diff --git a/subiquity/models/installprogress.py b/subiquitycore/models/installprogress.py
similarity index 94%
rename from subiquity/models/installprogress.py
rename to subiquitycore/models/installprogress.py
index 1cb566ee..ec7c52c8 100644
--- a/subiquity/models/installprogress.py
+++ b/subiquitycore/models/installprogress.py
@@ -14,10 +14,10 @@
# along with this program. If not, see .
import logging
-from subiquity.model import ModelPolicy
+from subiquitycore.model import ModelPolicy
-log = logging.getLogger('subiquity.models.installprogress')
+log = logging.getLogger('subiquitycore.models.installprogress')
class InstallProgressModel(ModelPolicy):
diff --git a/subiquity/models/iscsi_disk.py b/subiquitycore/models/iscsi_disk.py
similarity index 94%
rename from subiquity/models/iscsi_disk.py
rename to subiquitycore/models/iscsi_disk.py
index 989a11dd..35bf6447 100644
--- a/subiquity/models/iscsi_disk.py
+++ b/subiquitycore/models/iscsi_disk.py
@@ -15,10 +15,10 @@
import logging
-from subiquity.model import ModelPolicy
+from subiquitycore.model import ModelPolicy
-log = logging.getLogger('subiquity.models.iscsi_disk')
+log = logging.getLogger('subiquitycore.models.iscsi_disk')
class IscsiDiskModel(ModelPolicy):
diff --git a/subiquity/models/login.py b/subiquitycore/models/login.py
similarity index 93%
rename from subiquity/models/login.py
rename to subiquitycore/models/login.py
index ca0a9854..59ec9abe 100644
--- a/subiquity/models/login.py
+++ b/subiquitycore/models/login.py
@@ -14,10 +14,10 @@
# along with this program. If not, see .
import logging
-from subiquity.model import ModelPolicy
+from subiquitycore.model import ModelPolicy
-log = logging.getLogger('subiquity.login')
+log = logging.getLogger('subiquitycore.login')
class LoginModel(ModelPolicy):
diff --git a/subiquity/models/network.py b/subiquitycore/models/network.py
similarity index 98%
rename from subiquity/models/network.py
rename to subiquitycore/models/network.py
index efb7ef68..7f1fee36 100644
--- a/subiquity/models/network.py
+++ b/subiquitycore/models/network.py
@@ -17,10 +17,10 @@ import errno
import ipaddress
import logging
import os
-from subiquity.prober import make_network_info
-from subiquity.model import ModelPolicy
-from subiquity.utils import (read_sys_net,
- sys_dev_path)
+from subiquitycore.prober import make_network_info
+from subiquitycore.model import ModelPolicy
+from subiquitycore.utils import (read_sys_net,
+ sys_dev_path)
from .actions import (
BondAction,
@@ -31,7 +31,7 @@ from .actions import (
)
NETDEV_IGNORED_IFACES = ['lo', 'bridge', 'tun', 'tap']
-log = logging.getLogger('subiquity.models.network')
+log = logging.getLogger('subiquitycore.models.network')
class Networkdev():
diff --git a/subiquity/models/raid.py b/subiquitycore/models/raid.py
similarity index 94%
rename from subiquity/models/raid.py
rename to subiquitycore/models/raid.py
index 9c16277d..b218fadc 100644
--- a/subiquity/models/raid.py
+++ b/subiquitycore/models/raid.py
@@ -14,10 +14,10 @@
# along with this program. If not, see .
import logging
-from subiquity.model import ModelPolicy
+from subiquitycore.model import ModelPolicy
-log = logging.getLogger('subiquity.models.raid')
+log = logging.getLogger('subiquitycore.models.raid')
class RaidModel(ModelPolicy):
diff --git a/subiquity/models/welcome.py b/subiquitycore/models/welcome.py
similarity index 93%
rename from subiquity/models/welcome.py
rename to subiquitycore/models/welcome.py
index 54888ac6..2b467b1a 100644
--- a/subiquity/models/welcome.py
+++ b/subiquitycore/models/welcome.py
@@ -14,10 +14,10 @@
# along with this program. If not, see .
import logging
-from subiquity.model import ModelPolicy
+from subiquitycore.model import ModelPolicy
-log = logging.getLogger('subiquity.welcome')
+log = logging.getLogger('subiquitycore.welcome')
class WelcomeModel(ModelPolicy):
diff --git a/subiquity/palette.py b/subiquitycore/palette.py
similarity index 100%
rename from subiquity/palette.py
rename to subiquitycore/palette.py
diff --git a/subiquity/prober.py b/subiquitycore/prober.py
similarity index 98%
rename from subiquity/prober.py
rename to subiquitycore/prober.py
index 36b928c2..8f7807e1 100644
--- a/subiquity/prober.py
+++ b/subiquitycore/prober.py
@@ -21,7 +21,7 @@ from probert.storage import (Storage,
from probert.network import (Network,
NetworkInfo)
-log = logging.getLogger('subiquity.prober')
+log = logging.getLogger('subiquitycore.prober')
class ProberException(Exception):
diff --git a/subiquity/signals.py b/subiquitycore/signals.py
similarity index 100%
rename from subiquity/signals.py
rename to subiquitycore/signals.py
diff --git a/subiquity/tests/__init__.py b/subiquitycore/tests/__init__.py
similarity index 100%
rename from subiquity/tests/__init__.py
rename to subiquitycore/tests/__init__.py
diff --git a/subiquity/tests/data/fake_machine.json b/subiquitycore/tests/data/fake_machine.json
similarity index 100%
rename from subiquity/tests/data/fake_machine.json
rename to subiquitycore/tests/data/fake_machine.json
diff --git a/subiquity/tests/fakes.py b/subiquitycore/tests/fakes.py
similarity index 100%
rename from subiquity/tests/fakes.py
rename to subiquitycore/tests/fakes.py
diff --git a/subiquity/tests/test_models_filesystems.py b/subiquitycore/tests/test_models_filesystems.py
similarity index 97%
rename from subiquity/tests/test_models_filesystems.py
rename to subiquitycore/tests/test_models_filesystems.py
index 0b1b563a..e959b335 100644
--- a/subiquity/tests/test_models_filesystems.py
+++ b/subiquitycore/tests/test_models_filesystems.py
@@ -5,14 +5,14 @@ import testtools
import yaml
from mock import patch
-from subiquity.models.blockdev import (Blockdev,
- blockdev_align_up,
- FIRST_PARTITION_OFFSET,
- GPT_END_RESERVE,
- sort_actions)
-from subiquity.models.filesystem import FilesystemModel
-from subiquity.prober import Prober
-from subiquity.tests import fakes
+from subiquitycore.models.blockdev import (Blockdev,
+ blockdev_align_up,
+ FIRST_PARTITION_OFFSET,
+ GPT_END_RESERVE,
+ sort_actions)
+from subiquitycore.models.filesystem import FilesystemModel
+from subiquitycore.prober import Prober
+from subiquitycore.tests import fakes
GB = 1 << 40
diff --git a/subiquity/ui/__init__.py b/subiquitycore/ui/__init__.py
similarity index 100%
rename from subiquity/ui/__init__.py
rename to subiquitycore/ui/__init__.py
diff --git a/subiquity/ui/anchors.py b/subiquitycore/ui/anchors.py
similarity index 95%
rename from subiquity/ui/anchors.py
rename to subiquitycore/ui/anchors.py
index 363d6fcf..d1f93e3d 100644
--- a/subiquity/ui/anchors.py
+++ b/subiquitycore/ui/anchors.py
@@ -15,8 +15,8 @@
from urwid import WidgetWrap, Pile, Text, ProgressBar
from collections import deque
-from subiquity.ui.utils import Padding, Color
-from subiquity.ui.lists import SimpleList
+from subiquitycore.ui.utils import Padding, Color
+from subiquitycore.ui.lists import SimpleList
class Header(WidgetWrap):
diff --git a/subiquity/ui/buttons.py b/subiquitycore/ui/buttons.py
similarity index 100%
rename from subiquity/ui/buttons.py
rename to subiquitycore/ui/buttons.py
diff --git a/subiquity/ui/dummy.py b/subiquitycore/ui/dummy.py
similarity index 94%
rename from subiquity/ui/dummy.py
rename to subiquitycore/ui/dummy.py
index 7ae2041a..af3698bf 100644
--- a/subiquity/ui/dummy.py
+++ b/subiquitycore/ui/dummy.py
@@ -17,8 +17,8 @@
"""
from urwid import (WidgetWrap, Text, Pile, ListBox)
-from subiquity.ui.buttons import cancel_btn
-from subiquity.ui.utils import Padding, Color
+from subiquitycore.ui.buttons import cancel_btn
+from subiquitycore.ui.utils import Padding, Color
class DummyView(WidgetWrap):
diff --git a/subiquity/ui/error.py b/subiquitycore/ui/error.py
similarity index 91%
rename from subiquity/ui/error.py
rename to subiquitycore/ui/error.py
index 47fd6173..5c5130a2 100644
--- a/subiquity/ui/error.py
+++ b/subiquitycore/ui/error.py
@@ -18,10 +18,10 @@
import logging
from urwid import (WidgetWrap, Text, Pile, ListBox)
-from subiquity.ui.buttons import cancel_btn
-from subiquity.ui.utils import Padding, Color
+from subiquitycore.ui.buttons import cancel_btn
+from subiquitycore.ui.utils import Padding, Color
-log = logging.getLogger('subiquity.ui.error')
+log = logging.getLogger('subiquitycore.ui.error')
class ErrorView(WidgetWrap):
diff --git a/subiquity/ui/frame.py b/subiquitycore/ui/frame.py
similarity index 93%
rename from subiquity/ui/frame.py
rename to subiquitycore/ui/frame.py
index 21680f07..2a3437ce 100644
--- a/subiquity/ui/frame.py
+++ b/subiquitycore/ui/frame.py
@@ -16,11 +16,11 @@
""" Base Frame Widget """
from urwid import Frame, WidgetWrap
-from subiquity.ui.anchors import Header, Footer, Body
+from subiquitycore.ui.anchors import Header, Footer, Body
import logging
-log = logging.getLogger('subiquity.ui.frame')
+log = logging.getLogger('subiquitycore.ui.frame')
class SubiquityUI(WidgetWrap):
diff --git a/subiquity/ui/interactive.py b/subiquitycore/ui/interactive.py
similarity index 98%
rename from subiquity/ui/interactive.py
rename to subiquitycore/ui/interactive.py
index c778b1fe..c5a2e8e6 100644
--- a/subiquity/ui/interactive.py
+++ b/subiquitycore/ui/interactive.py
@@ -20,7 +20,7 @@ from urwid import (Edit, IntEdit, RadioButton, WidgetWrap)
import logging
import re
-log = logging.getLogger("subiquity.ui.input")
+log = logging.getLogger("subiquitycore.ui.input")
class StringEditor(WidgetWrap):
diff --git a/subiquity/ui/lists.py b/subiquitycore/ui/lists.py
similarity index 100%
rename from subiquity/ui/lists.py
rename to subiquitycore/ui/lists.py
diff --git a/subiquity/ui/utils.py b/subiquitycore/ui/utils.py
similarity index 99%
rename from subiquity/ui/utils.py
rename to subiquitycore/ui/utils.py
index 3acaf2aa..b37ac856 100644
--- a/subiquity/ui/utils.py
+++ b/subiquitycore/ui/utils.py
@@ -18,7 +18,7 @@
from urwid import Padding as _Padding
from urwid import AttrMap, Text
from functools import partialmethod
-from subiquity.palette import STYLES
+from subiquitycore.palette import STYLES
def apply_padders(cls):
diff --git a/subiquity/ui/views/__init__.py b/subiquitycore/ui/views/__init__.py
similarity index 100%
rename from subiquity/ui/views/__init__.py
rename to subiquitycore/ui/views/__init__.py
diff --git a/subiquity/ui/views/bcache.py b/subiquitycore/ui/views/bcache.py
similarity index 94%
rename from subiquity/ui/views/bcache.py
rename to subiquitycore/ui/views/bcache.py
index 1237d0ac..7a239513 100644
--- a/subiquity/ui/views/bcache.py
+++ b/subiquitycore/ui/views/bcache.py
@@ -14,14 +14,14 @@
# along with this program. If not, see .
from urwid import Text, Pile, ListBox
-from subiquity.models.filesystem import _humanize_size
-from subiquity.view import ViewPolicy
-from subiquity.ui.buttons import cancel_btn, done_btn
-from subiquity.ui.interactive import Selector
-from subiquity.ui.utils import Color, Padding
+from subiquitycore.models.filesystem import _humanize_size
+from subiquitycore.view import ViewPolicy
+from subiquitycore.ui.buttons import cancel_btn, done_btn
+from subiquitycore.ui.interactive import Selector
+from subiquitycore.ui.utils import Color, Padding
import logging
-log = logging.getLogger('subiquity.ui.bcache')
+log = logging.getLogger('subiquitycore.ui.bcache')
class BcacheView(ViewPolicy):
diff --git a/subiquity/ui/views/ceph.py b/subiquitycore/ui/views/ceph.py
similarity index 92%
rename from subiquity/ui/views/ceph.py
rename to subiquitycore/ui/views/ceph.py
index ba561147..f1c03df5 100644
--- a/subiquity/ui/views/ceph.py
+++ b/subiquitycore/ui/views/ceph.py
@@ -14,13 +14,13 @@
# along with this program. If not, see .
from urwid import Text, Columns, Pile, ListBox
-from subiquity.view import ViewPolicy
-from subiquity.ui.buttons import cancel_btn, done_btn
-from subiquity.ui.interactive import StringEditor
-from subiquity.ui.utils import Color, Padding
+from subiquitycore.view import ViewPolicy
+from subiquitycore.ui.buttons import cancel_btn, done_btn
+from subiquitycore.ui.interactive import StringEditor
+from subiquitycore.ui.utils import Color, Padding
import logging
-log = logging.getLogger('subiquity.ceph')
+log = logging.getLogger('subiquitycore.ceph')
class CephDiskView(ViewPolicy):
diff --git a/subiquity/ui/views/filesystem.py b/subiquitycore/ui/views/filesystem.py
similarity index 97%
rename from subiquity/ui/views/filesystem.py
rename to subiquitycore/ui/views/filesystem.py
index 08867ef6..b09edc6a 100644
--- a/subiquity/ui/views/filesystem.py
+++ b/subiquitycore/ui/views/filesystem.py
@@ -22,18 +22,18 @@ configuration.
import logging
import re
from urwid import (ListBox, Pile, BoxAdapter, Text, Columns)
-from subiquity.ui.lists import SimpleList
-from subiquity.ui.buttons import (done_btn,
- reset_btn,
- cancel_btn,
- menu_btn)
-from subiquity.ui.utils import Padding, Color
-from subiquity.ui.interactive import (StringEditor, IntegerEditor,
- Selector, MountEditor)
-from subiquity.models.filesystem import (_humanize_size,
- _dehumanize_size,
- HUMAN_UNITS)
-from subiquity.view import ViewPolicy
+from subiquitycore.ui.lists import SimpleList
+from subiquitycore.ui.buttons import (done_btn,
+ reset_btn,
+ cancel_btn,
+ menu_btn)
+from subiquitycore.ui.utils import Padding, Color
+from subiquitycore.ui.interactive import (StringEditor, IntegerEditor,
+ Selector, MountEditor)
+from subiquitycore.models.filesystem import (_humanize_size,
+ _dehumanize_size,
+ HUMAN_UNITS)
+from subiquitycore.view import ViewPolicy
INVALID_PARTITION_SIZE = 'Invalid Partition Size'
PARTITION_SIZE_TOO_BIG = 'Requested size too big'
@@ -43,7 +43,7 @@ PARTITION_ERRORS = [
]
-log = logging.getLogger('subiquity.ui.filesystem')
+log = logging.getLogger('subiquitycore.ui.filesystem')
class DiskInfoView(ViewPolicy):
diff --git a/subiquity/ui/views/identity.py b/subiquitycore/ui/views/identity.py
similarity index 94%
rename from subiquity/ui/views/identity.py
rename to subiquitycore/ui/views/identity.py
index 12aeeda9..6c686b56 100644
--- a/subiquity/ui/views/identity.py
+++ b/subiquitycore/ui/views/identity.py
@@ -20,18 +20,18 @@ Welcome provides user with language selection
"""
import logging
from urwid import (Pile, Columns, Text, ListBox)
-from subiquity.ui.buttons import done_btn, cancel_btn
-from subiquity.ui.interactive import (PasswordEditor,
- RealnameEditor,
- StringEditor,
- UsernameEditor)
-from subiquity.ui.utils import Padding, Color
-from subiquity.view import ViewPolicy
-from subiquity.curtin import (curtin_write_postinst_config,
- curtin_configure_user)
+from subiquitycore.ui.buttons import done_btn, cancel_btn
+from subiquitycore.ui.interactive import (PasswordEditor,
+ RealnameEditor,
+ StringEditor,
+ UsernameEditor)
+from subiquitycore.ui.utils import Padding, Color
+from subiquitycore.view import ViewPolicy
+from subiquitycore.curtin import (curtin_write_postinst_config,
+ curtin_configure_user)
-log = logging.getLogger("subiquity.views.identity")
+log = logging.getLogger("subiquitycore.views.identity")
HOSTNAME_MAXLEN = 64
REALNAME_MAXLEN = 160
diff --git a/subiquity/ui/views/installpath.py b/subiquitycore/ui/views/installpath.py
similarity index 89%
rename from subiquity/ui/views/installpath.py
rename to subiquitycore/ui/views/installpath.py
index 0e56ef3a..31373a5f 100644
--- a/subiquity/ui/views/installpath.py
+++ b/subiquitycore/ui/views/installpath.py
@@ -20,12 +20,12 @@ Provides high level options for Ubuntu install
"""
import logging
from urwid import (ListBox, Pile, BoxAdapter)
-from subiquity.ui.lists import SimpleList
-from subiquity.ui.buttons import menu_btn, cancel_btn
-from subiquity.ui.utils import Padding, Color
-from subiquity.view import ViewPolicy
+from subiquitycore.ui.lists import SimpleList
+from subiquitycore.ui.buttons import menu_btn, cancel_btn
+from subiquitycore.ui.utils import Padding, Color
+from subiquitycore.view import ViewPolicy
-log = logging.getLogger('subiquity.installpath')
+log = logging.getLogger('subiquitycore.installpath')
class InstallpathView(ViewPolicy):
diff --git a/subiquity/ui/views/installprogress.py b/subiquitycore/ui/views/installprogress.py
similarity index 90%
rename from subiquity/ui/views/installprogress.py
rename to subiquitycore/ui/views/installprogress.py
index 904cbaf3..69bc4b9f 100644
--- a/subiquity/ui/views/installprogress.py
+++ b/subiquitycore/ui/views/installprogress.py
@@ -16,11 +16,11 @@
import logging
from urwid import (Text, Filler,
Pile)
-from subiquity.view import ViewPolicy
-from subiquity.ui.buttons import confirm_btn
-from subiquity.ui.utils import Padding, Color
+from subiquitycore.view import ViewPolicy
+from subiquitycore.ui.buttons import confirm_btn
+from subiquitycore.ui.utils import Padding, Color
-log = logging.getLogger("subiquity.views.installprogress")
+log = logging.getLogger("subiquitycore.views.installprogress")
class ProgressView(ViewPolicy):
diff --git a/subiquity/ui/views/iscsi.py b/subiquitycore/ui/views/iscsi.py
similarity index 94%
rename from subiquity/ui/views/iscsi.py
rename to subiquitycore/ui/views/iscsi.py
index ce483db7..52abe037 100644
--- a/subiquity/ui/views/iscsi.py
+++ b/subiquitycore/ui/views/iscsi.py
@@ -14,14 +14,14 @@
# along with this program. If not, see .
from urwid import Text, Columns, Pile, ListBox
-from subiquity.view import ViewPolicy
-from subiquity.ui.buttons import menu_btn
-from subiquity.ui.interactive import (StringEditor, YesNo,
- PasswordEditor)
-from subiquity.ui.utils import Color, Padding
+from subiquitycore.view import ViewPolicy
+from subiquitycore.ui.buttons import menu_btn
+from subiquitycore.ui.interactive import (StringEditor, YesNo,
+ PasswordEditor)
+from subiquitycore.ui.utils import Color, Padding
import logging
-log = logging.getLogger('subiquity.iscsi')
+log = logging.getLogger('subiquitycore.iscsi')
class IscsiDiskView(ViewPolicy):
diff --git a/subiquity/ui/views/login.py b/subiquitycore/ui/views/login.py
similarity index 93%
rename from subiquity/ui/views/login.py
rename to subiquitycore/ui/views/login.py
index a198ed1f..0ec01b32 100644
--- a/subiquity/ui/views/login.py
+++ b/subiquitycore/ui/views/login.py
@@ -22,13 +22,13 @@ import copy
import logging
import os
from urwid import (ListBox, Pile, BoxAdapter, Text)
-from subiquity.ui.lists import SimpleList
-from subiquity.ui.buttons import finish_btn
-from subiquity.ui.utils import Padding, Color
-from subiquity.view import ViewPolicy
-from subiquity import utils
+from subiquitycore.ui.lists import SimpleList
+from subiquitycore.ui.buttons import finish_btn
+from subiquitycore.ui.utils import Padding, Color
+from subiquitycore.view import ViewPolicy
+from subiquitycore import utils
-log = logging.getLogger("subiquity.views.login")
+log = logging.getLogger("subiquitycore.views.login")
class LoginView(ViewPolicy):
diff --git a/subiquity/ui/views/lvm.py b/subiquitycore/ui/views/lvm.py
similarity index 92%
rename from subiquity/ui/views/lvm.py
rename to subiquitycore/ui/views/lvm.py
index 9167a226..3ffa4c68 100644
--- a/subiquity/ui/views/lvm.py
+++ b/subiquitycore/ui/views/lvm.py
@@ -14,14 +14,14 @@
# along with this program. If not, see .
from urwid import Text, Columns, Pile, ListBox, CheckBox
-from subiquity.models.filesystem import _humanize_size
-from subiquity.view import ViewPolicy
-from subiquity.ui.buttons import cancel_btn, done_btn
-from subiquity.ui.interactive import UsernameEditor
-from subiquity.ui.utils import Color, Padding
+from subiquitycore.models.filesystem import _humanize_size
+from subiquitycore.view import ViewPolicy
+from subiquitycore.ui.buttons import cancel_btn, done_btn
+from subiquitycore.ui.interactive import UsernameEditor
+from subiquitycore.ui.utils import Color, Padding
import logging
-log = logging.getLogger('subiquity.ui.lvm')
+log = logging.getLogger('subiquitycore.ui.lvm')
class LVMVolumeGroupView(ViewPolicy):
diff --git a/subiquity/ui/views/network.py b/subiquitycore/ui/views/network.py
similarity index 96%
rename from subiquity/ui/views/network.py
rename to subiquitycore/ui/views/network.py
index ada203b8..c066b127 100644
--- a/subiquity/ui/views/network.py
+++ b/subiquitycore/ui/views/network.py
@@ -24,13 +24,13 @@ import textwrap
from urwid import (ListBox, Pile, BoxAdapter,
Text, Columns)
import yaml
-from subiquity.ui.lists import SimpleList
-from subiquity.ui.buttons import cancel_btn, menu_btn, done_btn
-from subiquity.ui.utils import Padding, Color
-from subiquity.view import ViewPolicy
+from subiquitycore.ui.lists import SimpleList
+from subiquitycore.ui.buttons import cancel_btn, menu_btn, done_btn
+from subiquitycore.ui.utils import Padding, Color
+from subiquitycore.view import ViewPolicy
-log = logging.getLogger('subiquity.views.network')
+log = logging.getLogger('subiquitycore.views.network')
class NetworkView(ViewPolicy):
diff --git a/subiquity/ui/views/network_bond_interfaces.py b/subiquitycore/ui/views/network_bond_interfaces.py
similarity index 94%
rename from subiquity/ui/views/network_bond_interfaces.py
rename to subiquitycore/ui/views/network_bond_interfaces.py
index 48991fd6..f16e2f98 100644
--- a/subiquity/ui/views/network_bond_interfaces.py
+++ b/subiquitycore/ui/views/network_bond_interfaces.py
@@ -14,13 +14,13 @@
# along with this program. If not, see .
from urwid import Text, Columns, Pile, ListBox, CheckBox
-from subiquity.view import ViewPolicy
-from subiquity.ui.buttons import cancel_btn, done_btn
-from subiquity.ui.interactive import Selector
-from subiquity.ui.utils import Color, Padding
+from subiquitycore.view import ViewPolicy
+from subiquitycore.ui.buttons import cancel_btn, done_btn
+from subiquitycore.ui.interactive import Selector
+from subiquitycore.ui.utils import Color, Padding
import logging
-log = logging.getLogger('subiquity.ui.bond_interfaces')
+log = logging.getLogger('subiquitycore.ui.bond_interfaces')
class NetworkBondInterfacesView(ViewPolicy):
diff --git a/subiquity/ui/views/network_configure_interface.py b/subiquitycore/ui/views/network_configure_interface.py
similarity index 93%
rename from subiquity/ui/views/network_configure_interface.py
rename to subiquitycore/ui/views/network_configure_interface.py
index 86f823b1..4bd36103 100644
--- a/subiquity/ui/views/network_configure_interface.py
+++ b/subiquitycore/ui/views/network_configure_interface.py
@@ -14,12 +14,12 @@
# along with this program. If not, see .
from urwid import Text, Pile, ListBox
-from subiquity.view import ViewPolicy
-from subiquity.ui.buttons import done_btn, menu_btn
-from subiquity.ui.utils import Color, Padding
+from subiquitycore.view import ViewPolicy
+from subiquitycore.ui.buttons import done_btn, menu_btn
+from subiquitycore.ui.utils import Color, Padding
import logging
-log = logging.getLogger('subiquity.network.network_configure_interface')
+log = logging.getLogger('subiquitycore.network.network_configure_interface')
class NetworkConfigureInterfaceView(ViewPolicy):
diff --git a/subiquity/ui/views/network_configure_ipv4_interface.py b/subiquitycore/ui/views/network_configure_ipv4_interface.py
similarity index 94%
rename from subiquity/ui/views/network_configure_ipv4_interface.py
rename to subiquitycore/ui/views/network_configure_ipv4_interface.py
index 9828ad1b..c65e70be 100644
--- a/subiquity/ui/views/network_configure_ipv4_interface.py
+++ b/subiquitycore/ui/views/network_configure_ipv4_interface.py
@@ -14,13 +14,13 @@
# along with this program. If not, see .
from urwid import Text, Pile, ListBox, Columns
-from subiquity.view import ViewPolicy
-from subiquity.ui.buttons import done_btn, menu_btn, cancel_btn
-from subiquity.ui.utils import Color, Padding
-from subiquity.ui.interactive import StringEditor
+from subiquitycore.view import ViewPolicy
+from subiquitycore.ui.buttons import done_btn, menu_btn, cancel_btn
+from subiquitycore.ui.utils import Color, Padding
+from subiquitycore.ui.interactive import StringEditor
import logging
-log = logging.getLogger('subiquity.network.network_configure_ipv4_interface')
+log = logging.getLogger('subiquitycore.network.network_configure_ipv4_interface')
class NetworkConfigureIPv4InterfaceView(ViewPolicy):
diff --git a/subiquity/ui/views/network_default_route.py b/subiquitycore/ui/views/network_default_route.py
similarity index 93%
rename from subiquity/ui/views/network_default_route.py
rename to subiquitycore/ui/views/network_default_route.py
index fc428d9b..a4384539 100644
--- a/subiquity/ui/views/network_default_route.py
+++ b/subiquitycore/ui/views/network_default_route.py
@@ -14,13 +14,13 @@
# along with this program. If not, see .
from urwid import Text, Pile, ListBox
-from subiquity.view import ViewPolicy
-from subiquity.ui.buttons import cancel_btn, done_btn, menu_btn
-from subiquity.ui.utils import Color, Padding
-from subiquity.ui.interactive import StringEditor
+from subiquitycore.view import ViewPolicy
+from subiquitycore.ui.buttons import cancel_btn, done_btn, menu_btn
+from subiquitycore.ui.utils import Color, Padding
+from subiquitycore.ui.interactive import StringEditor
import logging
-log = logging.getLogger('subiquity.network.set_default_route')
+log = logging.getLogger('subiquitycore.network.set_default_route')
class NetworkSetDefaultRouteView(ViewPolicy):
diff --git a/subiquity/ui/views/raid.py b/subiquitycore/ui/views/raid.py
similarity index 92%
rename from subiquity/ui/views/raid.py
rename to subiquitycore/ui/views/raid.py
index 7f4a4e22..d7ffd0db 100644
--- a/subiquity/ui/views/raid.py
+++ b/subiquitycore/ui/views/raid.py
@@ -14,15 +14,15 @@
# along with this program. If not, see .
from urwid import Text, Columns, Pile, ListBox, CheckBox
-from subiquity.models.filesystem import _humanize_size
-from subiquity.view import ViewPolicy
-from subiquity.ui.buttons import cancel_btn, done_btn
-from subiquity.ui.interactive import (StringEditor, IntegerEditor,
- Selector)
-from subiquity.ui.utils import Color, Padding
+from subiquitycore.models.filesystem import _humanize_size
+from subiquitycore.view import ViewPolicy
+from subiquitycore.ui.buttons import cancel_btn, done_btn
+from subiquitycore.ui.interactive import (StringEditor, IntegerEditor,
+ Selector)
+from subiquitycore.ui.utils import Color, Padding
import logging
-log = logging.getLogger('subiquity.ui.raid')
+log = logging.getLogger('subiquitycore.ui.raid')
class RaidView(ViewPolicy):
diff --git a/subiquity/ui/views/welcome.py b/subiquitycore/ui/views/welcome.py
similarity index 88%
rename from subiquity/ui/views/welcome.py
rename to subiquitycore/ui/views/welcome.py
index 7327da61..40153ef5 100644
--- a/subiquity/ui/views/welcome.py
+++ b/subiquitycore/ui/views/welcome.py
@@ -20,12 +20,12 @@ Welcome provides user with language selection
"""
import logging
from urwid import (ListBox, Pile, BoxAdapter)
-from subiquity.ui.lists import SimpleList
-from subiquity.ui.buttons import menu_btn, ok_btn, cancel_btn
-from subiquity.ui.utils import Padding, Color
-from subiquity.view import ViewPolicy
+from subiquitycore.ui.lists import SimpleList
+from subiquitycore.ui.buttons import menu_btn, ok_btn, cancel_btn
+from subiquitycore.ui.utils import Padding, Color
+from subiquitycore.view import ViewPolicy
-log = logging.getLogger("subiquity.views.welcome")
+log = logging.getLogger("subiquitycore.views.welcome")
class WelcomeView(ViewPolicy):
diff --git a/subiquity/ui/widgets.py b/subiquitycore/ui/widgets.py
similarity index 100%
rename from subiquity/ui/widgets.py
rename to subiquitycore/ui/widgets.py
diff --git a/subiquity/utils.py b/subiquitycore/utils.py
similarity index 98%
rename from subiquity/utils.py
rename to subiquitycore/utils.py
index 890266e3..129d5427 100644
--- a/subiquity/utils.py
+++ b/subiquitycore/utils.py
@@ -21,9 +21,9 @@ import random
import sys
import yaml
from subprocess import Popen, PIPE, call
-from subiquity.async import Async
+from subiquitycore.async import Async
-log = logging.getLogger("subiquity.utils")
+log = logging.getLogger("subiquitycore.utils")
SYS_CLASS_NET = "/sys/class/net/"
ENVIRONMENT_CHECK = '''
checks:
diff --git a/subiquity/view.py b/subiquitycore/view.py
similarity index 100%
rename from subiquity/view.py
rename to subiquitycore/view.py