From 81dbdc1acdfd44d285e6a91c9a25a94d47232f5d Mon Sep 17 00:00:00 2001 From: kaelyndunnell Date: Fri, 15 Nov 2024 16:13:27 -0500 Subject: [PATCH] accept changes --- pyproject.toml | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index ebc5d7f1d..64f5d7d16 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,6 @@ requires = ["setuptools >= 61", "wheel", "setuptools-scm[toml] >= 7.0.5"] build-backend = "setuptools.build_meta" [project] -<<<<<<< HEAD authors = [ { name = "Remi Delaporte-Mathurin" }, { email = "rdelaportemathurin@gmail.com" }, @@ -36,36 +35,6 @@ docs = ["sphinx", "sphinx-book-theme", "sphinx-design", "matplotlib"] Homepage = "https://github.com/RemDelaporteMathurin/FESTIM" Issues = "https://github.com/RemDelaporteMathurin/FESTIM/issues" -======= -name = "festim" -authors = [ - {name = "Remi Delaporte-Mathurin", email = "rdelaportemathurin@gmail.com"}, -] -description = "Finite element simulations of hydrogen transport" -license = {file = "LICENSE"} -classifiers = [ - "Natural Language :: English", - "Topic :: Scientific/Engineering", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.6", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", - "License :: OSI Approved :: Apache Software License", - "Operating System :: OS Independent", -] -requires-python = ">=3.6" -dynamic = ["version"] - -[project.optional-dependencies] -tests = ["pytest>=5.4.3"] - -[project.urls] -Repository = "https://github.com/festim-dev/FESTIM" -Issues = "https://github.com/festim-dev/FESTIM/issues" ->>>>>>> upstream [tool.setuptools_scm] write_to = "src/festim/_version.py"