upd set_logging for improved readability

fail fast if .test.env is not found

.github/dependabot.yml

@@ -0,0 +1,20 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
+      day: "monday"
+      time: "09:00"
+
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "monday"
+      time: "09:00"

.github/workflows/publish.yml

@@ -19,10 +19,10 @@ jobs:
       id-token: write
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v6
         with:
           python-version: '3.11'
           cache: 'pip'

.github/workflows/ruff.yml

@@ -13,7 +13,7 @@ jobs:
   ruff:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: astral-sh/ruff-action@v3
         with:
           args: 'format --check --diff'

README.md

@@ -50,7 +50,7 @@ The CLI should now be discoverable as `obsws-cli`
 -   --timeout/-T: Websocket timeout
 -   --version/-v: Print the obsws-cli version
 -   --loglevel/-l: Set the application's logging level
-    -   One of *DEBUG, INFO, WARNING, ERROR, CRITICAL*
+    -   One of *NOTSET, DEBUG, INFO, WARN, WARNING, ERROR, CRITICAL, FATAL*
 
 Pass `--host`, `--port` and `--password` as flags on the root command, for example:
 

obsws_cli/app.py

@@ -30,13 +30,19 @@ def version_callback(value: bool):
 
 def setup_logging(loglevel: str):
     """Set up logging for the application."""
-    loglevel = loglevel.upper()
+    level_map = logging.getLevelNamesMapping()
-    if loglevel not in ['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL']:
+    try:
-        raise typer.BadParameter(
+        level_int = level_map[loglevel.upper()]
-            f'Invalid log level: {loglevel}. Choose from DEBUG, INFO, WARNING, ERROR, CRITICAL.'
+    except KeyError:
+        possible_levels = ', '.join(
+            sorted(level_map.keys(), key=lambda k: level_map[k])
         )
+        raise typer.BadParameter(
+            f'Invalid log level: {loglevel}. Valid options are: {possible_levels}'
+        ) from None
+
     logging.basicConfig(
-        level=loglevel,
+        level=level_int,
         format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',
     )
 

pyproject.toml

@@ -35,6 +35,9 @@ obsws-cli = "obsws_cli:app"
 [tool.hatch.version]
 path = "obsws_cli/__about__.py"
 
+[tool.hatch.env]
+requires = ["hatch-dotenv"]
+
 [tool.hatch.envs.default]
 dependencies = ["click-man>=0.5.1"]
 
@@ -45,6 +48,10 @@ man = "python man/generate.py --output=./man"
 [tool.hatch.envs.hatch-test]
 randomize = true
 
+[tool.hatch.env.collectors.dotenv.hatch-test]
+env-files = [".env", ".test.env"]
+fail-on-missing = true
+
 [tool.hatch.envs.types]
 extra-dependencies = ["mypy>=1.0.0"]
 [tool.hatch.envs.types.scripts]

tests/conftest.py

@@ -4,7 +4,6 @@ import os
 import time
 
 import obsws_python as obsws
-from dotenv import find_dotenv, load_dotenv
 
 
 def pytest_configure(config):
@@ -34,14 +33,12 @@ def pytest_sessionstart(session):
     )
     print(' '.join(out))
 
-    load_dotenv(find_dotenv('.test.env'))
-
     session.obsws.set_stream_service_settings(
         'rtmp_common',
         {
             'service': 'Twitch',
             'server': 'auto',
-            'key': os.environ['OBS_STREAM_KEY'],
+            'key': os.environ['OBSWS_CLI_TESTS_STREAM_KEY'],
         },
     )
 
@@ -63,7 +60,7 @@ def pytest_sessionstart(session):
         'linux': 'pulse_output_capture',
         'darwin': 'coreaudio_output_capture',
     }
-    platform = os.environ.get('OBS_TESTS_PLATFORM', os.uname().sysname.lower())
+    platform = os.environ['OBSWS_CLI_TESTS_PLATFORM']
     try:
         session.obsws.create_input(
             sceneName='pytest_scene',

tests/test_group.py

@@ -9,7 +9,7 @@ from obsws_cli.app import app
 
 runner = CliRunner()
 
-if os.environ.get('OBS_TESTS_SKIP_GROUP_TESTS'):
+if os.environ.get('OBSWS_CLI_TESTS_SKIP_GROUP_TESTS'):
     pytest.skip(
         'Skipping group tests as per environment variable', allow_module_level=True
     )