mreg-cli 1.12.3__tar.gz → 1.12.4__tar.gz

{mreg_cli-1.12.3 → mreg_cli-1.12.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mreg-cli
-Version: 1.12.3
+Version: 1.12.4
 Summary: MREG interactive command line client
 Author: Others (see AUTHORS)
 Author-email: Øyvind Kolbu <oyvind.kolbu@usit.uio.no>, Safet A <amedov@usit.uio.no>, Magnus Hirth <mhmorgan42@gmail.com>, Nico <nicolaydmohebi@gmail.com>, Marius Bakke <marius.bakke@usit.uio.no>, Fredrik Larsen <fredrik.larsen@usit.uio.no>, Paal Braathen <paal.braathen@usit.uio.no>, Nils Hiorth <nils@nls.me>, Dmytro Karpenko <dmytrok@usit.uio.no>
@@ -26,7 +26,7 @@ Requires-Dist: pydantic-extra-types>=2.1.0
 Requires-Dist: platformdirs>=4.3.0
 Requires-Dist: pydantic-settings>=2.10.1
 Requires-Dist: rich>=13.9.4
-Requires-Dist: mreg-api<0.9.0,>=0.8.1
+Requires-Dist: mreg-api<0.9.0,>=0.8.3
 Dynamic: license-file
 
 # MREG CLI [![Build Status](https://github.com/unioslo/mreg-cli/actions/workflows/test.yml/badge.svg)](https://github.com/unioslo/mreg-cli/actions/workflows/test.yml)

{mreg_cli-1.12.3 → mreg_cli-1.12.4}/mreg_cli/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.12.3'
-__version_tuple__ = version_tuple = (1, 12, 3)
+__version__ = version = '1.12.4'
+__version_tuple__ = version_tuple = (1, 12, 4)
 
-__commit_id__ = commit_id = 'ga6f665012'
+__commit_id__ = commit_id = 'g062153374'

{mreg_cli-1.12.3 → mreg_cli-1.12.4}/mreg_cli/outputmanager.py

@@ -18,7 +18,6 @@ from pathlib import Path
 from typing import TYPE_CHECKING, Any, Generator, Literal, overload
 from urllib.parse import urlencode, urlparse
 
-import httpx
 from pydantic import BaseModel
 
 from mreg_cli.errorbuilder import build_error_message
@@ -305,7 +304,7 @@ class OutputManager:
             for key in self.KEYS_NOT_TO_RECORD:
                 remove_dict_key_recursive(obj, key)
             ret_dict["response"] = obj
-        except (httpx.DecodingError, json.JSONDecodeError):
+        except ValueError:
             s = record.response.content.decode("utf-8").strip()
             # Compare to empty string to avoid being tripped up by strings having
             # false-like values (0, False, etc)

{mreg_cli-1.12.3 → mreg_cli-1.12.4}/mreg_cli/utilities/api.py

@@ -11,7 +11,6 @@ import logging
 from typing import Callable, ParamSpec, TypeVar
 from urllib.parse import urljoin
 
-import httpx
 import mreg_api
 from prompt_toolkit import prompt
 
@@ -59,7 +58,7 @@ def try_token_or_login(user: str, url: str, fail_without_token: bool = False) ->
     try:
         client.test_auth()
         logger.info("Using stored token for %s @ %s", user, url)
-    except httpx.RequestError as e:
+    except mreg_api.exceptions.ConnectionFailedError as e:
         raise SystemExit(f"Could not connect to {url}: {e}") from None
     except mreg_api.exceptions.InvalidAuthTokenError as e:
         client.unset_token()  # NOTE: might be redundant
@@ -114,7 +113,7 @@ def auth_and_update_token(username: str, password: str) -> None:
     logger.info("Updating token for %s @ %s", username, tokenurl)
     try:
         token = client.login(username, password)
-    except httpx.HTTPError as e:
+    except mreg_api.exceptions.ConnectionFailedError as e:
         raise CliError(str(e)) from e  # should be unreachable
     except mreg_api.exceptions.LoginFailedError as e:
         # wrap the server API error in a CliError to classify as error + hide URL & drf details

{mreg_cli-1.12.3 → mreg_cli-1.12.4}/mreg_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mreg-cli
-Version: 1.12.3
+Version: 1.12.4
 Summary: MREG interactive command line client
 Author: Others (see AUTHORS)
 Author-email: Øyvind Kolbu <oyvind.kolbu@usit.uio.no>, Safet A <amedov@usit.uio.no>, Magnus Hirth <mhmorgan42@gmail.com>, Nico <nicolaydmohebi@gmail.com>, Marius Bakke <marius.bakke@usit.uio.no>, Fredrik Larsen <fredrik.larsen@usit.uio.no>, Paal Braathen <paal.braathen@usit.uio.no>, Nils Hiorth <nils@nls.me>, Dmytro Karpenko <dmytrok@usit.uio.no>
@@ -26,7 +26,7 @@ Requires-Dist: pydantic-extra-types>=2.1.0
 Requires-Dist: platformdirs>=4.3.0
 Requires-Dist: pydantic-settings>=2.10.1
 Requires-Dist: rich>=13.9.4
-Requires-Dist: mreg-api<0.9.0,>=0.8.1
+Requires-Dist: mreg-api<0.9.0,>=0.8.3
 Dynamic: license-file
 
 # MREG CLI [![Build Status](https://github.com/unioslo/mreg-cli/actions/workflows/test.yml/badge.svg)](https://github.com/unioslo/mreg-cli/actions/workflows/test.yml)

{mreg_cli-1.12.3 → mreg_cli-1.12.4}/mreg_cli.egg-info/requires.txt

@@ -6,4 +6,4 @@ pydantic-extra-types>=2.1.0
 platformdirs>=4.3.0
 pydantic-settings>=2.10.1
 rich>=13.9.4
-mreg-api<0.9.0,>=0.8.1
+mreg-api<0.9.0,>=0.8.3

mreg_cli-1.12.4/mreg_cli.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "1.12.4",
+  "distance": 0,
+  "node": "g0621533743bf947b0d1006883d16bd0f2a68fe15",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-10-26"
+}

{mreg_cli-1.12.3 → mreg_cli-1.12.4}/pyproject.toml

@@ -48,7 +48,7 @@ dependencies = [
     "platformdirs>=4.3.0",
     "pydantic-settings>=2.10.1",
     "rich>=13.9.4",
-    "mreg-api>=0.8.1,<0.9.0",      # prevent breaking changes in pre-1.0.0 minor versions
+    "mreg-api>=0.8.3,<0.9.0",      # prevent breaking changes in pre-1.0.0 minor versions
 ]
 dynamic = ["version"]
 

{mreg_cli-1.12.3 → mreg_cli-1.12.4}/tests/test_exceptions.py

@@ -5,7 +5,7 @@ from typing import TypeVar
 import mreg_api.exceptions
 import pytest
 from _pytest.mark.structures import ParameterSet
-from httpx import Request, Response
+from httpx2 import Request, Response
 from inline_snapshot import snapshot
 from mreg_api.exceptions import (
     APIError,

{mreg_cli-1.12.3 → mreg_cli-1.12.4}/uv.lock

@@ -1,6 +1,10 @@
 version = 1
 revision = 5
 requires-python = ">=3.11"
+resolution-markers = [
+    "python_full_version >= '3.12' and sys_platform == 'emscripten'",
+    "python_full_version < '3.12' or sys_platform != 'emscripten'",
+]
 
 [[package]]
 name = "altgraph"
@@ -65,15 +69,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/68/52/8ff5c1a3b2e821ced9b2998fba3ee29aa4525c0bf51e5ee55dd6f61a4ed5/cachetools-7.1.3-py3-none-any.whl", hash = "sha256:9876787e2346e20584d5cca236cb5d49d04e7193de91646f230725b2e1e8b804", size = 16763, upload-time = "2026-05-18T18:21:02.386Z" },
 ]
 
-[[package]]
-name = "certifi"
-version = "2026.10.19"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/a6/bd/1436c50cc46699de0230fbaacc1d1de7bfec413176099949e9d5112e88f2/certifi-2026.10.19.tar.gz", hash = "sha256:035c1e85572b141bf1c3a3eff0e33a8eb74917522f2559075ff8d2fea780a1ae", size = 137598, upload-time = "2026-10-20T02:24:16.604Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/c4/51/29046e48f693c54e5b7412216d447a1d8362c9653148d98c02cdf65fa733/certifi-2026.10.19-py3-none-any.whl", hash = "sha256:42d35340cc5b9ba78e818ddbff0c5b1c2b779de448a340fd1b989f5fa8670e1b", size = 136464, upload-time = "2026-10-20T02:24:15.072Z" },
-]
-
 [[package]]
 name = "colorama"
 version = "0.4.6"
@@ -151,31 +146,33 @@ wheels = [
 ]
 
 [[package]]
-name = "httpcore"
-version = "1.0.9"
+name = "httpcore2"
+version = "2.16.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
-    { name = "certifi" },
     { name = "h11" },
+    { name = "truststore" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/06/94/82699a10bca87a5556c9c59b5963f2d039dbd239f25bc2a63907a05a14cb/httpcore-1.0.9.tar.gz", hash = "sha256:6e34463af53fd2ab5d807f399a9b45ea31c3dfa2276f15a2c3f00afff6e176e8", size = 85484, upload-time = "2025-04-24T22:06:22.219Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/c0/61/afa9d6b7452f9eca73f73d45324eb0bb52f098fd5e6049bf6b8263be9b4e/httpcore2-2.16.0.tar.gz", hash = "sha256:c72cd0413563b17e1cd8354677dff887466f8ec2551679759e93126534428643", size = 69886, upload-time = "2026-10-21T07:09:45.31Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/7e/f5/f66802a942d491edb555dd61e3a9961140fd64c90bce1eafd741609d334d/httpcore-1.0.9-py3-none-any.whl", hash = "sha256:2d400746a40668fc9dec9810239072b40b4484b640a8c38fd654a024c7a1bf55", size = 78784, upload-time = "2025-04-24T22:06:20.566Z" },
+    { url = "https://files.pythonhosted.org/packages/af/c2/ce417c397afa5181f0e3c6ff01a4d01639414e1adef08730d97571297151/httpcore2-2.16.0-py3-none-any.whl", hash = "sha256:5c4358319f2602d984ad93182c9fee5160f22e9da7babdda870a5e7c4e2dc34f", size = 85070, upload-time = "2026-10-21T07:09:42.802Z" },
 ]
 
 [[package]]
-name = "httpx"
-version = "0.28.1"
+name = "httpx2"
+version = "2.16.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
-    { name = "anyio" },
-    { name = "certifi" },
-    { name = "httpcore" },
+    { name = "anyio", marker = "sys_platform != 'emscripten'" },
+    { name = "httpcore2", marker = "sys_platform != 'emscripten'" },
+    { name = "httpx2-jsfetch", marker = "python_full_version >= '3.12' and sys_platform == 'emscripten'" },
     { name = "idna" },
+    { name = "truststore", marker = "sys_platform != 'emscripten'" },
+    { name = "typing-extensions", marker = "python_full_version < '3.13'" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/b1/df/48c586a5fe32a0f01324ee087459e112ebb7224f646c0b5023f5e79e9956/httpx-0.28.1.tar.gz", hash = "sha256:75e98c5f16b0f35b567856f597f06ff2270a374470a5c2392242528e3e3e42fc", size = 141406, upload-time = "2024-12-06T15:37:23.222Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/43/73/5ca2cedf5e4e50423d1c258877865a6b62793633b561c58499f8aeb33b7e/httpx2-2.16.0.tar.gz", hash = "sha256:0d54c98128e8f2ff7fbbde0fca8c359e5f032edeaaaac443cdb7f31f685bcd7f", size = 103116, upload-time = "2026-10-21T07:09:46.348Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/2a/39/e50c7c3a983047577ee07d2a9e53faf5a69493943ec3f6a384bdc792deb2/httpx-0.28.1-py3-none-any.whl", hash = "sha256:d909fcccc110f8c7faf814ca82a9a4d816bc5a6dbfea25d6591d6985b8ba59ad", size = 73517, upload-time = "2024-12-06T15:37:21.509Z" },
+    { url = "https://files.pythonhosted.org/packages/7b/3d/2e4bc4fd1ef9770871669adb348d612a6e4786b303a23f9935b81c48dd60/httpx2-2.16.0-py3-none-any.whl", hash = "sha256:fd2c5d7909e8d86fe92d53020c310ca0e4e431b838c207c5754b9bbf0308d49a", size = 97880, upload-time = "2026-10-21T07:09:44.01Z" },
 ]
 
 [package.optional-dependencies]
@@ -183,13 +180,22 @@ socks = [
     { name = "socksio" },
 ]
 
+[[package]]
+name = "httpx2-jsfetch"
+version = "1.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/cd/c4/0e5636363151a2a1795e0a77617168b9ca438e1748ec05fc9b5687f93d64/httpx2_jsfetch-1.0.tar.gz", hash = "sha256:70a0e3eabfef7cce5ad9c629f7d01ca05e418f586646f4ddf14782e4c1454c60", size = 6872, upload-time = "2026-08-07T00:13:07.492Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/9b/43/832f631d32e4f1211caa2ba368317739fe71f0b8530e4c9d15dc454bac2a/httpx2_jsfetch-1.0-py3-none-any.whl", hash = "sha256:cb916b707601e69a07721aabc8f3f6659be3a6893bc1ff5c6f9e02241df2da32", size = 6382, upload-time = "2026-08-07T00:13:06.567Z" },
+]
+
 [[package]]
 name = "idna"
-version = "3.15"
+version = "3.20"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/82/77/7b3966d0b9d1d31a36ddf1746926a11dface89a83409bf1483f0237aa758/idna-3.15.tar.gz", hash = "sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc", size = 199245, upload-time = "2026-05-12T22:45:57.011Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/f5/08/8eea9d4b8302028f3abb2c0813953f7aec26d33b7a8960ed760e65ff29fa/idna-3.20.tar.gz", hash = "sha256:a7db850025b95ded1eae8a46181a1a6c56c92c96f0e2b005d9ff8dc0210cab44", size = 216463, upload-time = "2026-09-17T14:11:04.752Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/d2/23/408243171aa9aaba178d3e2559159c24c1171a641aa83b67bdd3394ead8e/idna-3.15-py3-none-any.whl", hash = "sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8", size = 72340, upload-time = "2026-05-12T22:45:55.733Z" },
+    { url = "https://files.pythonhosted.org/packages/58/a2/bb081bab032533a855d44de1d56f8e8426114ff1ba5d1f07a438a0a654f8/idna-3.20-py3-none-any.whl", hash = "sha256:ab7ae7122974553370f0bdb919e1a960b2cd1bc1ef0276416d896db81c14582c", size = 69583, upload-time = "2026-09-17T14:11:03.168Z" },
 ]
 
 [[package]]
@@ -326,19 +332,19 @@ wheels = [
 
 [[package]]
 name = "mreg-api"
-version = "0.8.1"
+version = "0.8.3"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "diskcache" },
-    { name = "httpx", extra = ["socks"] },
+    { name = "httpx2", extra = ["socks"] },
     { name = "pydantic" },
     { name = "pydantic-extra-types" },
     { name = "pydantic-settings" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/6a/8e/0bd42d9ac676a399b8abf59223013774e2d121265609e2a2dd571a598136/mreg_api-0.8.1.tar.gz", hash = "sha256:8d945171af824a9e9df99613b7154c7f589885c7dc039ae7715afbb03ce44bdf", size = 254976, upload-time = "2026-10-22T10:58:22.537Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/fc/ab/a3d7dc6050759da12b149dc70430b14c782201bfc3429ab03bfd172cce4a/mreg_api-0.8.3.tar.gz", hash = "sha256:d9f94b04d589a464ca9b44def6f8bad260b4383cba0be68ba9d12beb3f705c31", size = 255852, upload-time = "2026-10-26T14:02:10.368Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/e6/bd/84b7845543d7322e253b39606aa252d3e05a36b090fc1b090405e60b4668/mreg_api-0.8.1-py3-none-any.whl", hash = "sha256:5aace77629a5cd255f55a2b09bd2d16766a6c6114f81c41d3b9b72e62d50fdf9", size = 101916, upload-time = "2026-10-22T10:58:21.051Z" },
+    { url = "https://files.pythonhosted.org/packages/1e/67/abe90e7b77f120bf9ef55e07fb7534c476d9b53946ffd0a7379de2461f08/mreg_api-0.8.3-py3-none-any.whl", hash = "sha256:f2d39232bcb3d681d8a5a2c0530aa45af4a2f99e5a27cf754fded83ef213614e", size = 101912, upload-time = "2026-10-26T14:02:08.228Z" },
 ]
 
 [[package]]
@@ -383,7 +389,7 @@ dev = [
 
 [package.metadata]
 requires-dist = [
-    { name = "mreg-api", specifier = ">=0.8.1,<0.9.0" },
+    { name = "mreg-api", specifier = ">=0.8.3,<0.9.0" },
     { name = "platformdirs", specifier = ">=4.3.0" },
     { name = "prompt-toolkit", specifier = ">=3.0.0" },
     { name = "pydantic", extras = ["email"], specifier = ">=2.7.1" },
@@ -904,6 +910,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/5f/53/4a33dc81da39db7b31e5622333df361e8fe055b7ec636bd5fea762c9182d/tox_uv_bare-1.35.2-py3-none-any.whl", hash = "sha256:c0d590a41d1054a1ad0874e9e5943ff52402786e3d4599d8f8d37a65b566ef53", size = 22307, upload-time = "2026-05-05T01:34:17.681Z" },
 ]
 
+[[package]]
+name = "truststore"
+version = "0.10.5"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/ee/9f/c5201d42a484c061e528825fc8e2d565f5abd50a4ced6fb7d29c4ec99b2b/truststore-0.10.5.tar.gz", hash = "sha256:30d36967ccaded5cbb38d602c433f53600036c79d502f4533a49b60a03bbefcd", size = 28091, upload-time = "2026-10-12T22:27:31.808Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/51/e9/3a7820be2bb0fe53b6bc9c3be26d3d1158004e4c3ab953aa6840b955b1e9/truststore-0.10.5-py3-none-any.whl", hash = "sha256:9aaaedaefaf06d8b206278cf8b5012bc897f485a874503501e12d776df78951c", size = 19017, upload-time = "2026-10-12T22:27:30.377Z" },
+]
+
 [[package]]
 name = "typing-extensions"
 version = "4.16.0"

mreg_cli-1.12.3/mreg_cli.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "1.12.3",
-  "distance": 0,
-  "node": "ga6f665012097340fd9ba075b85ca473e88ef69c6",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-10-22"
-}