Use pydantic2 as the default version in CI

.github/workflows/ci.yml

@@ -32,7 +32,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - {python: '3.11', os: ubuntu-22.04, tox: pydantic2-full}
+          - {python: '3.11', os: ubuntu-22.04, tox: pydantic1-full}
           - {python: '3.11', os: ubuntu-22.04, tox: py311-full}
           - {python: '3.10', os: ubuntu-22.04, tox: py310-full}
           - {python: '3.9', os: ubuntu-22.04, tox: py39-full}

requirements-pydantic2/base.in → requirements-pydantic1/base.in

@@ -1,6 +1,6 @@
 email-validator
 fabric
 paramiko
-pydantic == 2
+pydantic < 2
 python-dateutil
 requests

requirements-pydantic2/base.txt → requirements-pydantic1/base.txt

@@ -1,12 +1,10 @@
-# SHA1:2b55aaac9edd959da15c313d2f5f84f4e2cc5f2a
+# SHA1:f8c625c62cb057cead0d70b0a458c8aed4f43459
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
 #
 #    pip-compile-multi
 #
-annotated-types==0.5.0
-    # via pydantic
 bcrypt==4.0.1
     # via paramiko
 certifi==2023.7.22
@@ -26,9 +24,9 @@ deprecated==1.2.14
 dnspython==2.4.2
     # via email-validator
 email-validator==2.0.0.post2
-    # via -r base.in
+    # via -r requirements-pydantic1/base.in
 fabric==3.2.2
-    # via -r base.in
+    # via -r requirements-pydantic1/base.in
 idna==3.4
     # via
     #   email-validator
@@ -37,27 +35,23 @@ invoke==2.2.0
     # via fabric
 paramiko==3.3.1
     # via
-    #   -r base.in
+    #   -r requirements-pydantic1/base.in
     #   fabric
 pycparser==2.21
     # via cffi
-pydantic==2.0
-    # via -r base.in
-pydantic-core==2.0.1
-    # via pydantic
+pydantic==1.10.12
+    # via -r requirements-pydantic1/base.in
 pynacl==1.5.0
     # via paramiko
 python-dateutil==2.8.2
-    # via -r base.in
+    # via -r requirements-pydantic1/base.in
 requests==2.31.0
-    # via -r base.in
+    # via -r requirements-pydantic1/base.in
 six==1.16.0
     # via python-dateutil
-typing-extensions==4.7.1
-    # via
-    #   pydantic
-    #   pydantic-core
-urllib3==2.0.4
+typing-extensions==4.8.0
+    # via pydantic
+urllib3==2.0.5
     # via requests
 wrapt==1.15.0
     # via deprecated

requirements-pydantic2/test.txt → requirements-pydantic1/test.txt

@@ -11,27 +11,27 @@ attrs==23.1.0
 execnet==2.0.2
     # via pytest-xdist
 filelock[typing]==3.12.4
-    # via -r requirements-pydantic2/test.in
-hypothesis==6.84.3
-    # via -r requirements-pydantic2/test.in
+    # via -r requirements-pydantic1/test.in
+hypothesis==6.87.0
+    # via -r requirements-pydantic1/test.in
 iniconfig==2.0.0
     # via pytest
 packaging==23.1
     # via pytest
 pluggy==1.3.0
     # via pytest
 pyfakefs==5.2.4
-    # via -r requirements-pydantic2/test.in
+    # via -r requirements-pydantic1/test.in
 pytest==7.4.2
     # via
-    #   -r requirements-pydantic2/test.in
+    #   -r requirements-pydantic1/test.in
     #   pytest-randomly
     #   pytest-xdist
 pytest-randomly==3.15.0
-    # via -r requirements-pydantic2/test.in
+    # via -r requirements-pydantic1/test.in
 pytest-xdist==3.3.1
-    # via -r requirements-pydantic2/test.in
+    # via -r requirements-pydantic1/test.in
 pyyaml==6.0.1
-    # via -r requirements-pydantic2/test.in
+    # via -r requirements-pydantic1/test.in
 sortedcontainers==2.4.0
     # via hypothesis

requirements/base.in

@@ -1,6 +1,6 @@
 email-validator
 fabric
 paramiko
-pydantic < 2  # autodoc_pydantic is not compatible with pydantic 2
+pydantic >= 2
 python-dateutil
 requests

requirements/base.txt

@@ -1,10 +1,12 @@
-# SHA1:f8c625c62cb057cead0d70b0a458c8aed4f43459
+# SHA1:6b8a253be2c23e3bf131e90c6b06c34bf612344f
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
 #
 #    pip-compile-multi
 #
+annotated-types==0.5.0
+    # via pydantic
 bcrypt==4.0.1
     # via paramiko
 certifi==2023.7.22
@@ -24,9 +26,9 @@ deprecated==1.2.14
 dnspython==2.4.2
     # via email-validator
 email-validator==2.0.0.post2
-    # via -r base.in
+    # via -r requirements/base.in
 fabric==3.2.2
-    # via -r base.in
+    # via -r requirements/base.in
 idna==3.4
     # via
     #   email-validator
@@ -35,23 +37,27 @@ invoke==2.2.0
     # via fabric
 paramiko==3.3.1
     # via
-    #   -r base.in
+    #   -r requirements/base.in
     #   fabric
 pycparser==2.21
     # via cffi
-pydantic==1.10.12
-    # via -r base.in
+pydantic==2.3.0
+    # via -r requirements/base.in
+pydantic-core==2.6.3
+    # via pydantic
 pynacl==1.5.0
     # via paramiko
 python-dateutil==2.8.2
-    # via -r base.in
+    # via -r requirements/base.in
 requests==2.31.0
-    # via -r base.in
+    # via -r requirements/base.in
 six==1.16.0
     # via python-dateutil
-typing-extensions==4.7.1
-    # via pydantic
-urllib3==2.0.4
+typing-extensions==4.8.0
+    # via
+    #   pydantic
+    #   pydantic-core
+urllib3==2.0.5
     # via requests
 wrapt==1.15.0
     # via deprecated

requirements/dev.txt

@@ -11,7 +11,7 @@
 -r static.txt
 -r test.txt
 -r wheels.txt
-anyio==3.7.1
+anyio==4.0.0
     # via jupyter-server
 argon2-cffi==23.1.0
     # via jupyter-server
@@ -21,7 +21,7 @@ arrow==1.2.3
     # via isoduration
 async-lru==2.0.4
     # via jupyterlab
-black==23.7.0
+black==23.9.1
     # via -r requirements/dev.in
 click==8.1.7
     # via
@@ -36,7 +36,7 @@ json5==0.9.14
     # via jupyterlab-server
 jsonpointer==2.4
     # via jsonschema
-jsonschema[format-nongpl]==4.19.0
+jsonschema[format-nongpl]==4.19.1
     # via
     #   jupyter-events
     #   jupyterlab-server
@@ -45,17 +45,17 @@ jupyter-events==0.7.0
     # via jupyter-server
 jupyter-lsp==2.2.0
     # via jupyterlab
-jupyter-server==2.7.2
+jupyter-server==2.7.3
     # via
     #   jupyter-lsp
     #   jupyterlab
     #   jupyterlab-server
     #   notebook-shim
 jupyter-server-terminals==0.4.4
     # via jupyter-server
-jupyterlab==4.0.5
+jupyterlab==4.0.6
     # via -r requirements/dev.in
-jupyterlab-server==2.24.0
+jupyterlab-server==2.25.0
     # via jupyterlab
 mypy==1.5.1
     # via -r requirements/dev.in
@@ -101,17 +101,17 @@ types-paramiko==3.3.0.0
     # via -r requirements/dev.in
 types-python-dateutil==2.8.19.14
     # via -r requirements/dev.in
-types-pyyaml==6.0.12.11
+types-pyyaml==6.0.12.12
     # via -r requirements/dev.in
-types-requests==2.31.0.2
+types-requests==2.31.0.5
     # via -r requirements/dev.in
 types-urllib3==1.26.25.14
     # via types-requests
 uri-template==1.3.0
     # via jsonschema
 webcolors==1.13
     # via jsonschema
-websocket-client==1.6.2
+websocket-client==1.6.3
     # via jupyter-server
 wheel==0.41.2
     # via pip-tools

requirements/docs.in

@@ -5,7 +5,7 @@ ipykernel
 ipython!=8.7.0  # Breaks syntax highlighting in Jupyter code cells.
 myst-parser
 nbsphinx
-pydata-sphinx-theme>=0.13
+pydata-sphinx-theme==0.13
 sphinx==7.1  # 7.2 is not compatible with theme
 sphinx-autodoc-typehints
 sphinx-copybutton

requirements/docs.txt

@@ -1,4 +1,4 @@
-# SHA1:330f38cb197740f43425c68384e5bd0b8ba57335
+# SHA1:7f29cc4342542cfe6bdf8daf4340784e8a03d50a
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -11,9 +11,9 @@ accessible-pygments==0.0.4
     # via pydata-sphinx-theme
 alabaster==0.7.13
     # via sphinx
-asttokens==2.2.1
+asttokens==2.4.0
     # via stack-data
-autodoc-pydantic==1.9.0
+autodoc-pydantic==2.0.1
     # via -r requirements/docs.in
 babel==2.12.1
     # via
@@ -29,7 +29,7 @@ bleach==6.0.0
     # via nbconvert
 comm==0.1.4
     # via ipykernel
-debugpy==1.6.7.post1
+debugpy==1.8.0
     # via ipykernel
 defusedxml==0.7.1
     # via nbconvert
@@ -45,9 +45,9 @@ fastjsonschema==2.18.0
     # via nbformat
 imagesize==1.4.1
     # via sphinx
-ipykernel==6.25.1
+ipykernel==6.25.2
     # via -r requirements/docs.in
-ipython==8.14.0
+ipython==8.15.0
     # via
     #   -r requirements/docs.in
     #   ipykernel
@@ -59,11 +59,11 @@ jinja2==3.1.2
     #   nbconvert
     #   nbsphinx
     #   sphinx
-jsonschema==4.19.0
+jsonschema==4.19.1
     # via nbformat
 jsonschema-specifications==2023.7.1
     # via jsonschema
-jupyter-client==8.3.0
+jupyter-client==8.3.1
     # via
     #   ipykernel
     #   nbclient
@@ -98,7 +98,7 @@ myst-parser==2.0.0
     # via -r requirements/docs.in
 nbclient==0.8.0
     # via nbconvert
-nbconvert==7.7.4
+nbconvert==7.8.0
     # via nbsphinx
 nbformat==5.9.2
     # via
@@ -107,7 +107,7 @@ nbformat==5.9.2
     #   nbsphinx
 nbsphinx==0.9.3
     # via -r requirements/docs.in
-nest-asyncio==1.5.7
+nest-asyncio==1.5.8
     # via ipykernel
 pandocfilters==1.5.0
     # via nbconvert
@@ -127,7 +127,9 @@ ptyprocess==0.7.0
     # via pexpect
 pure-eval==0.2.2
     # via stack-data
-pydata-sphinx-theme==0.13.3
+pydantic-settings==2.0.3
+    # via autodoc-pydantic
+pydata-sphinx-theme==0.13
     # via -r requirements/docs.in
 pygments==2.16.1
     # via
@@ -136,6 +138,8 @@ pygments==2.16.1
     #   nbconvert
     #   pydata-sphinx-theme
     #   sphinx
+python-dotenv==1.0.0
+    # via pydantic-settings
 pyzmq==25.1.1
     # via
     #   ipykernel
@@ -144,13 +148,13 @@ referencing==0.30.2
     # via
     #   jsonschema
     #   jsonschema-specifications
-rpds-py==0.9.2
+rpds-py==0.10.3
     # via
     #   jsonschema
     #   referencing
 snowballstemmer==2.2.0
     # via sphinx
-soupsieve==2.4.1
+soupsieve==2.5
     # via beautifulsoup4
 sphinx==7.1.0
     # via
@@ -193,7 +197,7 @@ tornado==6.3.3
     # via
     #   ipykernel
     #   jupyter-client
-traitlets==5.9.0
+traitlets==5.10.0
     # via
     #   comm
     #   ipykernel

requirements/static.txt

@@ -11,7 +11,7 @@ distlib==0.3.7
     # via virtualenv
 filelock==3.12.4
     # via virtualenv
-identify==2.5.28
+identify==2.5.29
     # via pre-commit
 nodeenv==1.8.0
     # via pre-commit

requirements/test.txt

@@ -12,7 +12,7 @@ execnet==2.0.2
     # via pytest-xdist
 filelock[typing]==3.12.4
     # via -r requirements/test.in
-hypothesis==6.84.3
+hypothesis==6.87.0
     # via -r requirements/test.in
 iniconfig==2.0.0
     # via pytest