v10.6.2: Support Pydantic v1 + v2

CHANGELOG.md

@@ -15,6 +15,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Nothing yet.
 
+## [10.6.2 - 2023-07-07]
+
+## Changed
+
+- Make package compatible with Pydantic v1.10.x and v2.
+
 ## [10.6.1 - 2023-07-07]
 
 ## Changed

Pipfile.lock

@@ -14,6 +14,14 @@
         ]
     },
     "default": {
+        "annotated-types": {
+            "hashes": [
+                "sha256:47cdc3490d9ac1506ce92c7aaa76c579dc3509ff11e098fc867e5130ab7be802",
+                "sha256:58da39888f92c276ad970249761ebea80ba544b77acddaa1a4d6cf78287d45fd"
+            ],
+            "markers": "python_version >= '3.7'",
+            "version": "==0.5.0"
+        },
         "anyio": {
             "hashes": [
                 "sha256:44a3c9aba0f5defa43261a8b3efb97891f2bd7d804e0e1f56419befa1adfc780",
@@ -91,45 +99,118 @@
         },
         "pydantic": {
             "hashes": [
-                "sha256:008c5e266c8aada206d0627a011504e14268a62091450210eda7c07fabe6963e",
-                "sha256:0588788a9a85f3e5e9ebca14211a496409cb3deca5b6971ff37c556d581854e7",
-                "sha256:08a6c32e1c3809fbc49debb96bf833164f3438b3696abf0fbeceb417d123e6eb",
-                "sha256:16928fdc9cb273c6af00d9d5045434c39afba5f42325fb990add2c241402d151",
-                "sha256:174899023337b9fc685ac8adaa7b047050616136ccd30e9070627c1aaab53a13",
-                "sha256:192c608ad002a748e4a0bed2ddbcd98f9b56df50a7c24d9a931a8c5dd053bd3d",
-                "sha256:1954f8778489a04b245a1e7b8b22a9d3ea8ef49337285693cf6959e4b757535e",
-                "sha256:2417de68290434461a266271fc57274a138510dca19982336639484c73a07af6",
-                "sha256:265a60da42f9f27e0b1014eab8acd3e53bd0bad5c5b4884e98a55f8f596b2c19",
-                "sha256:331c031ba1554b974c98679bd0780d89670d6fd6f53f5d70b10bdc9addee1713",
-                "sha256:373c0840f5c2b5b1ccadd9286782852b901055998136287828731868027a724f",
-                "sha256:3f34739a89260dfa420aa3cbd069fbcc794b25bbe5c0a214f8fb29e363484b66",
-                "sha256:41e0bb6efe86281623abbeeb0be64eab740c865388ee934cd3e6a358784aca6e",
-                "sha256:4400015f15c9b464c9db2d5d951b6a780102cfa5870f2c036d37c23b56f7fc1b",
-                "sha256:44e51ba599c3ef227e168424e220cd3e544288c57829520dc90ea9cb190c3248",
-                "sha256:469adf96c8e2c2bbfa655fc7735a2a82f4c543d9fee97bd113a7fb509bf5e622",
-                "sha256:5b02d24f7b2b365fed586ed73582c20f353a4c50e4be9ba2c57ab96f8091ddae",
-                "sha256:7522a7666157aa22b812ce14c827574ddccc94f361237ca6ea8bb0d5c38f1629",
-                "sha256:787cf23e5a0cde753f2eabac1b2e73ae3844eb873fd1f5bdbff3048d8dbb7604",
-                "sha256:8268a735a14c308923e8958363e3a3404f6834bb98c11f5ab43251a4e410170c",
-                "sha256:8dc77064471780262b6a68fe67e013298d130414d5aaf9b562c33987dbd2cf4f",
-                "sha256:a451ccab49971af043ec4e0d207cbc8cbe53dbf148ef9f19599024076fe9c25b",
-                "sha256:a6c098d4ab5e2d5b3984d3cb2527e2d6099d3de85630c8934efcfdc348a9760e",
-                "sha256:abade85268cc92dff86d6effcd917893130f0ff516f3d637f50dadc22ae93999",
-                "sha256:bc64eab9b19cd794a380179ac0e6752335e9555d214cfcb755820333c0784cb3",
-                "sha256:c3339a46bbe6013ef7bdd2844679bfe500347ac5742cd4019a88312aa58a9847",
-                "sha256:d185819a7a059550ecb85d5134e7d40f2565f3dd94cfd870132c5f91a89cf58c",
-                "sha256:d7781f1d13b19700b7949c5a639c764a077cbbdd4322ed505b449d3ca8edcb36",
-                "sha256:e297897eb4bebde985f72a46a7552a7556a3dd11e7f76acda0c1093e3dbcf216",
-                "sha256:e6cbfbd010b14c8a905a7b10f9fe090068d1744d46f9e0c021db28daeb8b6de1",
-                "sha256:e9738b0f2e6c70f44ee0de53f2089d6002b10c33264abee07bdb5c7f03038303",
-                "sha256:e9baf78b31da2dc3d3f346ef18e58ec5f12f5aaa17ac517e2ffd026a92a87588",
-                "sha256:ef55392ec4bb5721f4ded1096241e4b7151ba6d50a50a80a2526c854f42e6a2f",
-                "sha256:f66d479cf7eb331372c470614be6511eae96f1f120344c25f3f9bb59fb1b5528",
-                "sha256:fe429898f2c9dd209bd0632a606bddc06f8bce081bbd03d1c775a45886e2c1cb",
-                "sha256:ff44c5e89315b15ff1f7fdaf9853770b810936d6b01a7bcecaa227d2f8fe444f"
+                "sha256:b802f5245b8576315fe619e5989fd083448fa1258638ef9dac301ca60878396d",
+                "sha256:f5581e0c79b2ec2fa25a9d30d766629811cdda022107fa73d022ab5578873ae3"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==1.10.11"
+            "version": "==2.0.2"
+        },
+        "pydantic-core": {
+            "hashes": [
+                "sha256:017700236ea2e7afbef5d3803559c80bd8720306778ebd49268de7ce9972e83e",
+                "sha256:047e782b9918f35ef534ced36f1fd2064f5581229b7a15e4d3177387a6b53134",
+                "sha256:0681472245ef182554208a25d16884c84f1c5a69f14e6169b88932e5da739a1c",
+                "sha256:06ae67547251135a1b3f8dd465797b13146295a3866bc12ddd73f7512787bb7c",
+                "sha256:080a7af828388284a68ad7d3d3eac3bcfff6a580292849aff087e7d556ec42d4",
+                "sha256:0855cf8b760fb40f97f0226cb527c8a94a2ab9d8179628beae20d6939aaeacb0",
+                "sha256:087ddbb754575618a8832ee4ab52fe7eb332f502e2a56088b53dbeb5c4efdf9f",
+                "sha256:0b5d37aedea5963f2097bddbcdb255483191646a52d40d8bb66d61c190fcac91",
+                "sha256:0be2e2812a43205728a06c9d0fd090432cd76a9bb5bff2bfcfdf8b0e27d51851",
+                "sha256:0e5761ce986ec709897b1b965fad9743f301500434bea3cbab2b6e662571580f",
+                "sha256:15eb4cb543ed36f6a4f16e3bee7aa7ed1c3757be95a3f3bbb2b82b9887131e0f",
+                "sha256:1635a37137fafbc6ee0a8c879857e05b30b1aabaa927e653872b71f1501b1502",
+                "sha256:1a5c4475510d1a9cc1458a26cfc21442223e52ce9adb640775c38739315d03c7",
+                "sha256:1c917f7a41d9d09b8b024a5d65cf37e5588ccdb6e610d2df565fb7186b1f3b1c",
+                "sha256:2278ca0b0dfbcfb1e12fa58570916dc260dc72bee5e6e342debf5329d8204688",
+                "sha256:24c3c9180a2d19d640bacc2d00f497a9a1f2abadb2a9ee201b56bb03bc5343bd",
+                "sha256:2575664f0a559a7b951a518f6f34c23cab7190f34f8220b8c8218c4f403147ee",
+                "sha256:2ca2d2d5ab65fb40dd05259965006edcc62a9d9b30102737c0a6f45bcbd254e8",
+                "sha256:2ee3ae58f271851362f6c9b33e4c9f9e866557ec7d8c03dc091e9b5aa5566cec",
+                "sha256:3747a4178139ebf3f19541285b2eb7c886890ca4eb7eec851578c02a13cc1385",
+                "sha256:4663293a36a851a860b1299c50837914269fca127434911297dd39fea9667a01",
+                "sha256:46cd323371aa7e4053010ccdb94063a4273aa9e5dbe97f8a1147faa769de8d8d",
+                "sha256:4938b32c09dbcecbeb652327cb4a449b1ef1a1bf6c8fc2c8241aa6b8f6d63b54",
+                "sha256:4ac140d54da366672f6b91f9a1e8e2d4e7e72720143353501ae886d3fca03272",
+                "sha256:4aff436c23c68449601b3fba7075b4f37ef8fbb893c8c1ed3ef898f090332b1e",
+                "sha256:4e67f9b9dfda2e42b39459cbf99d319ccb90da151e35cead3521975b2afbf673",
+                "sha256:5056afea59651c4e47ec6dadbb77ccae4742c059a3d12bc1c0e393d189d2970d",
+                "sha256:51968887d6bd1eaa7fc7759701ea8ccb470c04654beaa8ede6835b0533f206a9",
+                "sha256:5948af62f323252d56acaec8ebfca5f15933f6b72f8dbe3bf21ee97b2d10e3f0",
+                "sha256:5a014ee88980013d192a718cbb88e8cea20acd3afad69bc6d15672d05a49cdb6",
+                "sha256:60b7239206a2f61ad89c7518adfacb3ccd6662eaa07c5e437317aea2615a1f18",
+                "sha256:682ff9228c838018c47dfa89b3d84cca45f88cacde28807ab8296ec221862af4",
+                "sha256:68a2a767953c707d9575dcf14d8edee7930527ee0141a8bb612c22d1f1059f9a",
+                "sha256:6bf00f56a4468f5b03dadb672a5f1d24aea303d4ccffe8a0f548c9e36017edd3",
+                "sha256:6e3bcb4a9bc209a61ea2aceb7433ce2ece32c7e670b0c06848bf870c9b3e7d87",
+                "sha256:7345b1741bf66a9d8ed0ec291c3eabd534444e139e1ea6db5742ac9fd3be2530",
+                "sha256:74a33aa69d476773230396396afb8e11908f8dafdcfd422e746770599a3f889d",
+                "sha256:7648e48ba263ca0a8a2dc55a60a219c9133fb101ba52c89a14a29fb3d4322ca3",
+                "sha256:7684b5fb906b37e940c5df3f57118f32e033af5e4770e5ae2ae56fbd2fe1a30a",
+                "sha256:76c9c55462740d728b344e3a087775846516c3fee31ec56e2075faa7cfcafcbf",
+                "sha256:7c7ad8958aadfbcd664078002246796ecd5566b64b22f6af4fd1bbcec6bf8f60",
+                "sha256:7ff6bfe63f447a509ed4d368a7f4ba6a7abc03bc4744fc3fb30f2ffab73f3821",
+                "sha256:804cf8f6a859620f8eb754c02f7770f61c3e9c519f8338c331d555b3d6976e3c",
+                "sha256:8125152b03dd91deca5afe5b933a1994b39405adf6be2fe8dce3632319283f85",
+                "sha256:817681d111cb65f07d46496eafec815f48e1aff37713b73135a0a9eb4d3610ab",
+                "sha256:818f5cb1b209ab1295087c45717178f4bbbd2bd7eda421f7a119e7b9b736a3cb",
+                "sha256:82e09f27edab289187dd924d4d93f2a35f21aa969699b2504aa643da7fbfeff9",
+                "sha256:840238c845b0f80777151fef0003088ab91c6f7b3467edaff4932b425c4e3c3f",
+                "sha256:87cff210af3258ca0c829e3ebc849d7981bfde23a99d6cb7a3c17a163b3dbad2",
+                "sha256:8884a1dbfc5cb8c54b48446ca916d4577c1f4d901126091e4ab25d00194e065f",
+                "sha256:88a56f0f6d020b4d17641f4b4d1f9540a536d4146768d059c430e97bdb485fc1",
+                "sha256:8b9a5fc4058d64c9c826684dcdb43891c1b474a4a88dcf8dfc3e1fb5889496f8",
+                "sha256:8c0213891898fa5b404cf3edf4797e3ac7819a0708ea5473fc6432a2aa27c189",
+                "sha256:8e6ce261ccb9a986953c4dce070327e4954f9dd4cd214746dfc70efbc713b6a1",
+                "sha256:8eb4e2b71562375609c66a79f89acd4fe95c5cba23473d04952c8b14b6f908f5",
+                "sha256:90b06bb47e60173d24c7cb79670aa8dd6081797290353b9d3c66d3a23e88eb34",
+                "sha256:94d368af9e6563de6e7170a74710a2cbace7a1e9c8e507d9e3ac34c7065d7ae3",
+                "sha256:9a5fba9168fc27805553760fa8198db46eef83bf52b4e87ebbe1333b823d0e70",
+                "sha256:9b9f8bf1d7008a58fbb6eb334dc6e2f2905400cced8dadb46c4ca28f005a8562",
+                "sha256:a4ae46769d9a7138d58cd190441cac14ce954010a0081f28462ed916c8e55a4f",
+                "sha256:a772c652603855d7180015849d483a1f539351a263bb9b81bfe85193a33ce124",
+                "sha256:a8b9c2cc4c5f8169b943d24be4bd1548fe81c016d704126e3a3124a2fc164885",
+                "sha256:aa39499625239da4ec960cf4fc66b023929b24cc77fb8520289cfdb3c1986428",
+                "sha256:aa54902fa51f7d921ba80923cf1c7ff3dce796a7903300bd8824deb90e357744",
+                "sha256:ac462a28218ea7d592c7ad51b517558f4ac6565a4e53db7a4811eeaf9c9660b0",
+                "sha256:af832edd384755826e494ffdcf1fdda86e4babc42a0b18d342943fb18181040e",
+                "sha256:b1fad38db1744d27061df516e59c5025b09b0a50a337c04e6eebdbddc18951bc",
+                "sha256:b4038869ba1d8fa33863b4b1286ab07e6075a641ae269b865f94d7e10b3e800e",
+                "sha256:b4673d1f29487608d613ebcc5caa99ba15eb58450a7449fb6d800f29d90bebc1",
+                "sha256:b4815720c266e832b20e27a7a5f3772bb09fdedb31a9a34bab7b49d98967ef5a",
+                "sha256:b59a64c367f350873c40a126ffe9184d903d2126c701380b4b55753484df5948",
+                "sha256:b74906e01c7fc938ac889588ef438de812989817095c3c4904721f647d64a4d1",
+                "sha256:b815a769b019dd96be6571096f246b74f63330547e9b30244c51b4a2eb0277fc",
+                "sha256:bad7029fb2251c1ac7d3acdd607e540d40d137a7d43a5e5acdcfdbd38db3fc0a",
+                "sha256:bb471ea8650796060afc99909d9b75da583d317e52f660faf64c45f70b3bf1e2",
+                "sha256:bd95d223de5162811a7b36c73d48eac4fee03b075132f3a1b73c132ce157a60c",
+                "sha256:be3419204952bbe9b72b90008977379c52f99ae1c6e640488de4be783c345d71",
+                "sha256:c0f481aaf0119f77b200e5a5e2799b3e14c015a317eaa948f42263908735cc9f",
+                "sha256:c2d00a96fdf26295c6f25eaf9e4a233f353146a73713cd97a5f5dc6090c3aef2",
+                "sha256:c720e55cef609d50418bdfdfb5c44a76efc020ae7455505788d0113c54c7df55",
+                "sha256:cb854ec52e6e2e05b83d647695f4d913452fdd45a3dfa8233d7dab5967b3908f",
+                "sha256:cbba32fb14e199d0493c6b9c44870dab0a9c37af9f0f729068459d1849279ffd",
+                "sha256:cd62f73830d4715bc643ae39de0bd4fb9c81d6d743530074da91e77a2cccfe67",
+                "sha256:cf92dccca8f66e987f6c4378700447f82b79e86407912ab1ee06b16b82f05120",
+                "sha256:d281a10837d98db997c0247f45d138522c91ce30cf3ae7a6afdb5e709707d360",
+                "sha256:d2c790f0d928b672484eac4f5696dd0b78f3d6d148a641ea196eb49c0875e30a",
+                "sha256:d35d634d9d1ed280c87bc2a7a6217b8787eedc86f368fc2fa1c0c8c78f7d3c93",
+                "sha256:db4564aea8b3cb6cf1e5f3fd80f1ced73a255d492396d1bd8abd688795b34d63",
+                "sha256:dc737506b4a0ba2922a2626fc6d620ce50a46aebd0fe2fbcad1b93bbdd8c7e78",
+                "sha256:e17056390068afd4583d88dcf4d4495764e4e2c7d756464468e0d21abcb8931e",
+                "sha256:e68a404fad8493989d6f07b7b9e066f1d2524d7cb64db2d4e9a84c920032c67f",
+                "sha256:e7fd334b40c5e13a97becfcaba314de0dcc6f7fe21ec8f992139bcc64700e9dc",
+                "sha256:eb4301f009a44bb5db5edfe4e51a8175a4112b566baec07f4af8b1f8cb4649a2",
+                "sha256:ebf583f4d9b52abd15cc59e5f6eeca7e3e9741c6ea62d8711c00ac3acb067875",
+                "sha256:ef71e73a81a4cd7e87c93e8ff0170140fd93ba33b0f61e83da3f55f6e0a84fb4",
+                "sha256:f0eb54b11cd4fe0c6404611eef77086ade03eb1457e92910bbb4f3479efa3f79",
+                "sha256:f2de65752fff248319bcd3b29da24e205fa505607539fcd4acc4037355175b63",
+                "sha256:f5de2d4167fd4bc5ad205fb7297e25867b8e335ca08d64ed7a561d2955a2c32d",
+                "sha256:f7bcdf70c8b6e70be11c78d3c00b80a24cccfb408128f23e91ec3019bed1ecc1",
+                "sha256:fa38a76e832743866aed6b715869757074b06357d1a260163ec26d84974245fe",
+                "sha256:fc909f62325a631e1401dd07dfc386986dbcac15f98c9ff2145d930678a9d25a"
+            ],
+            "markers": "python_version >= '3.7'",
+            "version": "==2.1.2"
         },
         "pygments": {
             "hashes": [

pyproject.toml

@@ -53,7 +53,7 @@ dynamic = ["version", "description"]
 keywords = ["bitcoin", "monero", "vps", "server"]
 license = {file = "LICENSE.txt"}
 dependencies = [
-    "pydantic~=1.10",
+    "pydantic>=1.10,<3",
     "httpx[socks]",
     "segno",
     "typer>=0.9.0",

src/sporestack/__init__.py

@@ -2,4 +2,4 @@
 
 __all__ = ["api", "api_client", "exceptions"]
 
-__version__ = "10.6.1"
+__version__ = "10.6.2"

src/sporestack/models.py

@@ -114,7 +114,7 @@ class Invoice(BaseModel):
             description="TXID of the transaction for this payment, if it was paid.",
             min_length=64,
             max_length=64,
-            regex="^[a-f0-9]+$",
+            pattern="^[a-f0-9]+$",
         ),
     ]
     expired: Annotated[
@@ -137,7 +137,7 @@ class ServerUpdateRequest(BaseModel):
             title="Hostname",
             description="Hostname to refer to your server by.",
             example="web-1",
-            regex="(^$|^[a-zA-Z0-9-_. ]+$)",
+            pattern="(^$|^[a-zA-Z0-9-_. ]+$)",
         ),
     ] = None
     autorenew: Annotated[

tests/test_api_client.py

@@ -145,7 +145,7 @@ def test_server_info(respx_mock: respx.MockRouter) -> None:
     # These aren't exhaustive, but there's a number here.
     assert info_response.machine_id == dummy_machine_id
     assert info_response.hostname == response_json["hostname"]
-    assert info_response.flavor == response_json["flavor"]
+    assert info_response.flavor.dict() == response_json["flavor"]
     assert info_response.token == response_json["token"]
     assert info_response.running == response_json["running"]
     assert info_response.created_at == response_json["created_at"]

tox.ini

@@ -1,13 +1,11 @@
 [tox]
 env_list =
-    py37
-    py38
-    py39
-    py310
-    py311
+    py{37,38,39,310,311}-pydantic{1,2}
 
 [testenv]
-deps = 
+deps =
+    pydantic1: pydantic~=1.10
+    pydantic2: pydantic~=2.0
     pytest~=7.2
     pytest-socket~=0.6.0
     pytest-cov~=4.0