Skip to content

Commit

Permalink
accept changes
Browse files Browse the repository at this point in the history
  • Loading branch information
kaelyndunnell committed Nov 15, 2024
1 parent f535cfc commit 81dbdc1
Showing 1 changed file with 0 additions and 31 deletions.
31 changes: 0 additions & 31 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "[email protected]" },
Expand Down Expand Up @@ -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 = "[email protected]"},
]
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"
Expand Down

0 comments on commit 81dbdc1

Please sign in to comment.