Fixed conflicts and lock dependencies

neo4j · Mar 11, 2024 · f64fa1d · f64fa1d
1 parent 0c921fe
commit f64fa1d
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 83 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,6 @@
 dist/
-<<<<<<< HEAD
-=======
 **/__pycache__/*
 *.py[cod]
 .mypy_cache/
 .coverage
 htmlcov/
->>>>>>> 4222460 (Update Github Actions)
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -7,11 +7,8 @@ license = "Apache License, Version 2.0"
 readme = "README.md"
 
 [tool.poetry.dependencies]
-python = ">=3.7"
+python = "^3.8"
 neo4j = "^5.17.0"
-<<<<<<< HEAD
-
-=======
 types-requests = "^2.31.0.20240218"
 pydantic = "^2.6.3"
 
@@ -23,15 +20,11 @@ pytest-mock = "^3.12.0"
 pre-commit = { version = "^3.6.2", python = "^3.9" }
 coverage = "^7.4.3"
 ruff = "^0.3.0"
->>>>>>> 4222460 (Update Github Actions)
 
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
-<<<<<<< HEAD
-exclude = ["**/tests/"]
-=======
 exclude = ["**/tests/"]
 
 [tool.pytest.ini_options]
@@ -45,4 +38,3 @@ source = ["src"]
 
 [tool.pylint."MESSAGES CONTROL"]
 disable="C0114,C0115"
->>>>>>> 4222460 (Update Github Actions)