Skip to content

Commit 607c451

Browse files
fix: resolve git merge conflict in pyproject.toml (unresolved HEAD vs 6a1c694)
1 parent 05188f5 commit 607c451

1 file changed

Lines changed: 0 additions & 43 deletions

File tree

pyproject.toml

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<<<<<<< HEAD
21
[build-system]
32
requires = ["setuptools>=68.0", "wheel"]
43
build-backend = "setuptools.build_meta"
@@ -12,46 +11,6 @@ requires-python = ">=3.10"
1211
license = "MIT"
1312
authors = [{name = "Revenue Holdings"}]
1413

15-
dependencies = [
16-
"click>=8.1",
17-
"rich>=13.0",
18-
]
19-
20-
[project.optional-dependencies]
21-
dev = [
22-
"pytest>=7.0",
23-
"pytest-cov>=4.0",
24-
]
25-
licensing = ["revenueholdings-license>=0.1.0"]
26-
27-
[project.scripts]
28-
deploydiff = "deploydiff.cli:main"
29-
30-
[project.urls]
31-
Homepage = "https://github.com/Coding-Dev-Tools/deploydiff"
32-
Repository = "https://github.com/Coding-Dev-Tools/deploydiff"
33-
Documentation = "https://github.com/Coding-Dev-Tools/deploydiff#readme"
34-
"Issue Tracker" = "https://github.com/Coding-Dev-Tools/deploydiff/issues"
35-
36-
[tool.setuptools.packages.find]
37-
where = ["src"]
38-
39-
[tool.pytest.ini_options]
40-
testpaths = ["tests"]
41-
=======
42-
[build-system]
43-
requires = ["setuptools>=68.0", "wheel"]
44-
build-backend = "setuptools.build_meta"
45-
46-
[project]
47-
name = "deploydiff"
48-
version = "0.1.0"
49-
description = "Preview infrastructure changes (Terraform, CloudFormation, Pulumi) with cost impact and rollback commands"
50-
readme = "README.md"
51-
requires-python = ">=3.9"
52-
license = "MIT"
53-
authors = [{name = "Revenue Holdings"}]
54-
5514
dependencies = [
5615
"click>=8.1",
5716
"rich>=13.0",
@@ -63,7 +22,6 @@ classifiers = [
6322
"Intended Audience :: Developers",
6423
"Topic :: System :: Systems Administration",
6524
"Programming Language :: Python :: 3",
66-
"Programming Language :: Python :: 3.9",
6725
"Programming Language :: Python :: 3.10",
6826
"Programming Language :: Python :: 3.11",
6927
"Programming Language :: Python :: 3.12",
@@ -102,4 +60,3 @@ ignore = ["E501"]
10260

10361
[tool.ruff.lint.isort]
10462
known-first-party = ["*"]
105-
>>>>>>> 6a1c694d4432dfdcf5c2689e7113670a0a2c2e6b

0 commit comments

Comments
 (0)