fix: conflicts

Author: vinitkumar

docs/requirements.in

@@ -1,14 +1,15 @@
-furo==2024.8.6
-sphinx
-sphinx-autobuild
+furo==2025.7.19
+sphinx==8.2.3
+sphinx-autobuild==2024.10.3
 
 # if using typehints
-sphinx-autodoc-typehints
+sphinx-autodoc-typehints==3.2.0
 
-mock
-autodoc
+mock==5.2.0
+autodoc==0.5.0
 
-defusedxml
-tornado
+defusedxml==0.7.1
+tornado==6.5.2
 jinja2>=3.1.6
-idna
+idna==3.10
+starlette>=0.47.2

docs/requirements.txt

@@ -1,17 +1,19 @@
 #
-# This file is autogenerated by pip-compile with Python 3.12
+# This file is autogenerated by pip-compile with Python 3.13
 # by the following command:
 #
-#    pip-compile requirements.in
+#    pip-compile
 #
+accessible-pygments==0.0.5
+    # via furo
 alabaster==1.0.0
     # via sphinx
 anyio==4.8.0
     # via
     #   starlette
     #   watchfiles
 autodoc==0.5.0
-    # via -r docs/requirements.in
+    # via -r requirements.in
 babel==2.17.0
     # via sphinx
 beautifulsoup4==4.13.3
@@ -29,55 +31,58 @@ colorama==0.4.6
 decorator==5.1.1
     # via autodoc
 defusedxml==0.7.1
-    # via -r docs/requirements.in
+    # via -r requirements.in
 docutils==0.21.2
     # via sphinx
-exceptiongroup==1.3.0
-    # via anyio
-furo==2024.8.6
-    # via -r docs/requirements.in
+furo==2025.7.19
+    # via -r requirements.in
 h11==0.16.0
     # via uvicorn
 idna==3.10
     # via
-    #   -r docs/requirements.in
+    #   -r requirements.in
     #   anyio
     #   requests
 imagesize==1.4.1
     # via sphinx
 jinja2==3.1.6
     # via
-    #   -r docs/requirements.in
+    #   -r requirements.in
     #   sphinx
+legacy-cgi==2.6.3
+    # via webob
 markupsafe==3.0.2
     # via jinja2
-mock==5.1.0
-    # via -r docs/requirements.in
+mock==5.2.0
+    # via -r requirements.in
 packaging==24.2
     # via sphinx
 pygments==2.19.1
     # via
+    #   accessible-pygments
     #   furo
     #   sphinx
 requests==2.32.4
     # via sphinx
+roman-numerals-py==3.1.0
+    # via sphinx
 sniffio==1.3.1
     # via anyio
 snowballstemmer==2.2.0
     # via sphinx
 soupsieve==2.6
     # via beautifulsoup4
-sphinx==8.1.3
+sphinx==8.2.3
     # via
-    #   -r docs/requirements.in
+    #   -r requirements.in
     #   furo
     #   sphinx-autobuild
     #   sphinx-autodoc-typehints
     #   sphinx-basic-ng
 sphinx-autobuild==2024.10.3
-    # via -r docs/requirements.in
-sphinx-autodoc-typehints==3.0.1
-    # via -r docs/requirements.in
+    # via -r requirements.in
+sphinx-autodoc-typehints==3.2.0
+    # via -r requirements.in
 sphinx-basic-ng==1.0.0b2
     # via furo
 sphinxcontrib-applehelp==2.0.0
@@ -92,18 +97,14 @@ sphinxcontrib-qthelp==2.0.0
     # via sphinx
 sphinxcontrib-serializinghtml==2.0.0
     # via sphinx
-starlette==0.45.3
-    # via sphinx-autobuild
-tomli==2.2.1
-    # via sphinx
-tornado==6.5.1
-    # via -r docs/requirements.in
-typing-extensions==4.12.2
+starlette==0.47.2
     # via
-    #   anyio
-    #   beautifulsoup4
-    #   exceptiongroup
-    #   uvicorn
+    #   -r requirements.in
+    #   sphinx-autobuild
+tornado==6.5.2
+    # via -r requirements.in
+typing-extensions==4.12.2
+    # via beautifulsoup4
 urllib3==2.5.0
     # via requests
 uvicorn==0.34.0

json2xml/__init__.py

@@ -2,5 +2,5 @@
 
 __author__ = """Vinit Kumar"""
 __email__ = "[email protected]"
-__version__ = "5.2.0"
+__version__ = "5.2.1"
 

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "json2xml"
-version = "5.2.0"  # Replace with the dynamic version if needed
+version = "5.2.1"  # Replace with the dynamic version if needed
 description = "Simple Python Library to convert JSON to XML"
 readme = "README.rst"
 requires-python = ">=3.10"
@@ -34,7 +34,6 @@ dependencies = [
     "pytest",
     "pytest-cov",
     "coverage",
-    "py",
     "setuptools",
 ]
 
@@ -47,7 +46,6 @@ include = ["json2xml"]
 [project.optional-dependencies]
 test = [
     "pytest==7.0.1",
-    "py==1.11.0"
 ]
 
 [tool.pytest.ini_options]

requirements-dev.in

@@ -1,11 +1,11 @@
 # When installing dev dependencies also install the user dependencies
 -r requirements.in
-xmltodict>=0.12.0
-pytest
-pytest-cov
-pytest-xdist>=3.5.0
-coverage
-ruff>=0.3.0
-setuptools
-mypy>=1.0.0
-types-setuptools
+xmltodict>=0.14.2
+pytest==8.4.1
+pytest-cov==6.2.1
+pytest-xdist==3.8.0
+coverage==7.10.3
+ruff==0.12.8
+setuptools==80.9.0
+mypy==1.17.1
+types-setuptools==80.9.0.20250809

requirements-dev.txt

@@ -1,51 +1,48 @@
 #
-# This file is autogenerated by pip-compile with Python 3.12
+# This file is autogenerated by pip-compile with Python 3.13
 # by the following command:
 #
 #    pip-compile requirements-dev.in
 #
-coverage[toml]==7.6.11
+coverage[toml]==7.10.3
     # via
     #   -r requirements-dev.in
     #   pytest-cov
 defusedxml==0.7.1
     # via -r requirements.in
-exceptiongroup==1.3.0
-    # via pytest
 execnet==2.1.1
     # via pytest-xdist
 iniconfig==2.0.0
     # via pytest
-mypy==1.15.0
+mypy==1.17.1
     # via -r requirements-dev.in
 mypy-extensions==1.0.0
     # via mypy
 packaging==24.2
     # via pytest
+pathspec==0.12.1
+    # via mypy
 pluggy==1.5.0
+    # via
+    #   pytest
+    #   pytest-cov
+pygments==2.19.2
     # via pytest
-pytest==8.3.4
+pytest==8.4.1
     # via
     #   -r requirements-dev.in
     #   pytest-cov
     #   pytest-xdist
-pytest-cov==6.0.0
+pytest-cov==6.2.1
     # via -r requirements-dev.in
-pytest-xdist==3.7.0
+pytest-xdist==3.8.0
     # via -r requirements-dev.in
-ruff==0.11.13
+ruff==0.12.8
     # via -r requirements-dev.in
-tomli==2.2.1
-    # via
-    #   coverage
-    #   mypy
-    #   pytest
-types-setuptools==80.9.0.20250529
+types-setuptools==80.9.0.20250809
     # via -r requirements-dev.in
 typing-extensions==4.12.2
-    # via
-    #   exceptiongroup
-    #   mypy
+    # via mypy
 urllib3==2.5.0
     # via -r requirements.in
 xmltodict==0.14.2

requirements.in

@@ -1,3 +1,3 @@
-defusedxml
-urllib3
+defusedxml==0.7.1
+urllib3==2.5.0
 

requirements.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.12
+# This file is autogenerated by pip-compile with Python 3.13
 # by the following command:
 #
 #    pip-compile