Migrate typer-slim->typer, requests->httpx, open version ranges, use Pydantic v2

Author: honnibal

requirements.txt

@@ -1,20 +1,19 @@
 # Our libraries
-confection>=0.0.4,<0.2.0
-wasabi>=0.9.1,<1.2.0
-srsly>=2.4.3,<3.0.0
-typer-slim>=0.3.0,<1.0.0
-cloudpathlib>=0.7.0,<1.0.0
-smart-open>=5.2.1,<8.0.0
+confection>=1.0.0
+wasabi>=0.9.1
+srsly>=2.4.3
+typer>=0.3.0
+cloudpathlib>=0.7.0
+smart-open>=5.2.1
 # Third party dependencies
-requests>=2.13.0,<3.0.0
-pydantic>=1.7.4,!=1.8,!=1.8.1,<3.0.0
+httpx>=0.24.0
+pydantic>=2.0.0
 # Official Python utilities
 packaging>=20.0
 # Development dependencies
 black==22.3.0
 pytest>=5.2.0,!=7.1.0
 mypy>=1.5.0,<1.7.0; python_version >= "3.8"
-types-requests
 types-setuptools>=57.0.0
 ruff>=0.0.259
 isort>=5.12.0,<6.0; python_version > "3.7"

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = weasel
-version = 0.4.3
+version = 1.0.0
 description = Weasel: A small and easy workflow system
 url = https://github.com/explosion/weasel/
 author = Explosion
@@ -31,15 +31,15 @@ project_urls =
 [options]
 python_requires = >=3.7
 install_requires =
-    confection>=0.0.4,<0.2.0
+    confection>=1.0.0
     packaging>=20.0
-    wasabi>=0.9.1,<1.2.0
-    srsly>=2.4.3,<3.0.0
-    typer-slim>=0.3.0,<1.0.0
-    cloudpathlib>=0.7.0,<1.0.0
-    smart-open>=5.2.1,<8.0.0
-    requests>=2.13.0,<3.0.0
-    pydantic>=1.7.4,!=1.8,!=1.8.1,<3.0.0
+    wasabi>=0.9.1
+    srsly>=2.4.3
+    typer>=0.3.0
+    cloudpathlib>=0.7.0
+    smart-open>=5.2.1
+    httpx>=0.24.0
+    pydantic>=2.0.0
 
 
 [options.entry_points]

weasel/cli/assets.py

@@ -4,7 +4,7 @@
 from pathlib import Path
 from typing import Any, Dict, Optional
 
-import requests
+import httpx
 import typer
 from wasabi import msg
 
@@ -172,7 +172,7 @@ def fetch_asset(
         try:
             download_file(url, dest_path)
             msg.good(f"Downloaded asset {dest}")
-        except requests.exceptions.RequestException as e:
+        except httpx.HTTPError as e:
             if Path(url).exists() and Path(url).is_file():
                 # If it's a local file, copy to destination
                 shutil.copy(url, str(dest_path))

weasel/schemas.py

@@ -1,11 +1,7 @@
 from collections import defaultdict
 from typing import Any, Dict, List, Optional, Type, Union
 
-try:
-    from pydantic.v1 import BaseModel, Field, StrictStr, ValidationError, root_validator
-except ImportError:
-    from pydantic import BaseModel, Field, StrictStr, ValidationError, root_validator  # type: ignore
-
+from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, model_validator
 from wasabi import msg
 
 
@@ -43,15 +39,15 @@ class ProjectConfigAssetURL(BaseModel):
     # fmt: off
     dest: StrictStr = Field(..., title="Destination of downloaded asset")
     url: Optional[StrictStr] = Field(None, title="URL of asset")
-    checksum: Optional[str] = Field(None, title="MD5 hash of file", regex=r"([a-fA-F\d]{32})")
+    checksum: Optional[str] = Field(None, title="MD5 hash of file", pattern=r"([a-fA-F\d]{32})")
     description: StrictStr = Field("", title="Description of asset")
     # fmt: on
 
 
 class ProjectConfigAssetGit(BaseModel):
     # fmt: off
     git: ProjectConfigAssetGitItem = Field(..., title="Git repo information")
-    checksum: Optional[str] = Field(None, title="MD5 hash of file", regex=r"([a-fA-F\d]{32})")
+    checksum: Optional[str] = Field(None, title="MD5 hash of file", pattern=r"([a-fA-F\d]{32})")
     description: Optional[StrictStr] = Field(None, title="Description of asset")
     # fmt: on
 
@@ -67,9 +63,10 @@ class ProjectConfigCommand(BaseModel):
     no_skip: bool = Field(False, title="Never skip this command, even if nothing changed")
     # fmt: on
 
-    class Config:
-        title = "A single named command specified in a project config"
-        extra = "forbid"
+    model_config = ConfigDict(
+        title="A single named command specified in a project config",
+        extra="forbid",
+    )
 
 
 class ProjectConfigSchema(BaseModel):
@@ -82,10 +79,10 @@ class ProjectConfigSchema(BaseModel):
     title: Optional[str] = Field(None, title="Project title")
     # fmt: on
 
-    class Config:
-        title = "Schema for project configuration file"
+    model_config = ConfigDict(title="Schema for project configuration file")
 
-    @root_validator(pre=True)
+    @model_validator(mode="before")
+    @classmethod
     def check_legacy_keys(cls, obj: Dict[str, Any]) -> Dict[str, Any]:
         if "spacy_version" in obj:
             msg.warn(