From f4cf05cd8dd5d59713fad8be967fc2f87167e213 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Mon, 28 Jun 2021 12:59:11 +0200
Subject: Drop dynaconf support

---
 poetry.lock                           | 23 +----------------------
 pyproject.toml                        |  1 -
 rwa/support/sessionservice/config.py  |  5 -----
 rwa/support/sessionservice/service.py |  2 +-
 test_client.py                        |  1 +
 5 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 0c0a1a8..0111965 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -292,23 +292,6 @@ toml = "*"
 [package.extras]
 pipenv = ["pipenv"]
 
-[[package]]
-name = "dynaconf"
-version = "3.1.4"
-description = "The dynamic configurator for your Python Project"
-category = "main"
-optional = false
-python-versions = "*"
-
-[package.extras]
-all = ["redis", "ruamel.yaml", "configobj", "hvac"]
-configobj = ["configobj"]
-ini = ["configobj"]
-redis = ["redis"]
-toml = ["toml"]
-vault = ["hvac"]
-yaml = ["ruamel.yaml"]
-
 [[package]]
 name = "flake8"
 version = "3.9.2"
@@ -1266,7 +1249,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pyt
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "e94d233aff281e3b0cdf43eab46ee628f6772a88780ca76396f008ae41fb4548"
+content-hash = "368a8ee38bb0c8659c6ef4c58e51052b6186ac516234b60488abee1aaa09f5c9"
 
 [metadata.files]
 alabaster = [
@@ -1414,10 +1397,6 @@ dparse = [
     {file = "dparse-0.5.1-py3-none-any.whl", hash = "sha256:e953a25e44ebb60a5c6efc2add4420c177f1d8404509da88da9729202f306994"},
     {file = "dparse-0.5.1.tar.gz", hash = "sha256:a1b5f169102e1c894f9a7d5ccf6f9402a836a5d24be80a986c7ce9eaed78f367"},
 ]
-dynaconf = [
-    {file = "dynaconf-3.1.4-py2.py3-none-any.whl", hash = "sha256:e6f383b84150b70fc439c8b2757581a38a58d07962aa14517292dcce1a77e160"},
-    {file = "dynaconf-3.1.4.tar.gz", hash = "sha256:b2f472d83052f809c5925565b8a2ba76a103d5dc1dbb9748b693ed67212781b9"},
-]
 flake8 = [
     {file = "flake8-3.9.2-py2.py3-none-any.whl", hash = "sha256:bf8fd333346d844f616e8d47905ef3a3384edae6b4e9beb0c5101e25e3110907"},
     {file = "flake8-3.9.2.tar.gz", hash = "sha256:07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b"},
diff --git a/pyproject.toml b/pyproject.toml
index de0b661..be6732c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -23,7 +23,6 @@ websockify = "^0.9.0"
 psutil = "^5.7.2"
 flask = "^1.1.2"
 argparse = "^1.0.10"
-dynaconf = "^3.0.0"
 usersettings = "^1.1.5"
 click = "^8.0.1"
 
diff --git a/rwa/support/sessionservice/config.py b/rwa/support/sessionservice/config.py
index 4f39a4e..de5518d 100644
--- a/rwa/support/sessionservice/config.py
+++ b/rwa/support/sessionservice/config.py
@@ -24,11 +24,6 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 import usersettings
-from dynaconf import Dynaconf
-
-settings = Dynaconf(
-    envvar_prefix="RWA", settings_files=["/etc/rwa/support/sessionservice/settings.toml"]
-)
 
 user_settings = usersettings.Settings("org.ArcticaProject.RWASupportSessionService")
 user_settings.add_setting("web_app_hosts", list, ["http://127.0.0.1:8000"])
diff --git a/rwa/support/sessionservice/service.py b/rwa/support/sessionservice/service.py
index e3ca5a1..52bf627 100755
--- a/rwa/support/sessionservice/service.py
+++ b/rwa/support/sessionservice/service.py
@@ -321,7 +321,7 @@ class RWASupportSessionService(dbus.service.Object):
         return False
 
     def _stop_all(self):
-        """Stop all sessions"""
+        """Stop all sessions."""
         logging.info("Stop all sessions.")
         for session in list(self.sessions.values()):
             session.stop()
diff --git a/test_client.py b/test_client.py
index 5176ad2..deb5252 100755
--- a/test_client.py
+++ b/test_client.py
@@ -73,5 +73,6 @@ def refresh_status(pid: int):
     response = req.refresh_status(pid)
     click.echo(f"Your response is: {response}")
 
+
 if __name__ == "__main__":
     cli()
-- 
cgit v1.2.3