Resolve merge conflict in 'pyproject.toml'

Author: robert-nogueira

examples/creating_config_file/with_wrapper.py

@@ -34,7 +34,6 @@
 
 [OPTIONAL] parameters
 ---------------------
-avatar: str | None = None
 description: str | None = None
 subdomain: str | None = None
 start: str | None = None

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "squarecloud-api"
-version = "3.1.4"
+version = "3.1.5"
 description = "SquareCloud API wrapper"
 authors = ["Robert Nogueira <robertlucasnogueira@gmail.com>"]
 repository = "https://github.com/squarecloudofc/wrapper-api-py"
@@ -10,11 +10,11 @@ readme = "README.md"
 packages = [{ include = "squarecloud" }]
 
 [tool.poetry.dependencies]
-python = "^3.10"
+python = "^3.9"
 aiohttp = "3.8.3"
 click = "^8.1.6"
 rich = "^13.5.2"
-python-dotenv = "^1.0.0"
+pydantic = "^2.5.2"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.4.3"
@@ -26,13 +26,7 @@ python-dotenv = "^1.0.0"
 pytest-asyncio = "^0.21.1"
 pre-commit = "^3.3.3"
 ruff = "^0.0.289"
-
-[tool.poetry.group.doc.dependencies]
-mkdocs-material = "^9.1.21"
-mkdocstrings = "^0.22.0"
-mkdocstrings-python = "^1.2.1"
-termynal = "^0.11.0"
-mkdocs-table-reader-plugin = "^2.0.1"
+memory-profiler = "^0.61.0"
 
 [build-system]
 requires = ["poetry-core"]
@@ -47,7 +41,7 @@ profile = "black"
 line_length = 79
 
 [tool.taskipy.tasks]
-lint = "isort . && blue --check --diff ."
+lint = "isort . && blue . && ruff ."
 pre_test = "task lint"
 test = "pytest -s -x --cov=squarecloud -vv tests"
 post_test = "coverage html"
@@ -64,4 +58,4 @@ line-length = 79
 exclude = ['env']
 
 [tool.ruff.per-file-ignores]
-'__init__.py' = ['F401']
+'__init__.py' = ['F401']

squarecloud/__init__.py

@@ -1,18 +1,16 @@
 from __future__ import annotations
 
 from .client import Client, create_config_file
-from .errors import (
-    ApplicationNotFound,
-    AuthenticationFailure,
-    BadRequestError,
-    FewMemory,
-    InvalidFile,
-    MissingConfigFile,
-    MissingDependenciesFile,
-    NotFoundError,
-    RequestError,
-    SquareException,
-    TooManyRequests,
+from .data import (
+    AppData,
+    BackupData,
+    FileInfo,
+    LogsData,
+    PlanData,
+    StatisticsData,
+    StatusData,
+    UploadData,
+    UserData,
 )
 from .file import File
 from .http.endpoints import Endpoint