From f4dbde985485e6edc3ed99c68b9d8b5beda40c22 Mon Sep 17 00:00:00 2001
From: Logan Ward <ward.logan.t@gmail.com>
Date: Mon, 22 Jan 2024 15:57:22 -0500
Subject: [PATCH] Switch back to setuptools

They use TOML and don't pin you in to the poetry env managment system
---
 .github/workflows/python-package.yml |  1 -
 pyproject.toml                       | 48 ++++++++++++++--------------
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index b631c72..6d80274 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -19,7 +19,6 @@ jobs:
           pip install -e .[test]
       - name: Lint with flake8
         run: |
-          pip install flake8
           flake8 batdata/ scripts/ tests
       - name: Test with pytest
         run: |
diff --git a/pyproject.toml b/pyproject.toml
index 402b230..bf868fd 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,38 +1,38 @@
-[tool.poetry]
+[project]
 name = "battery-data-toolkit"
 version = "0.1.1"
 description = "Utilities for reading and manipulating battery testing data"
 readme = "README.md"
 requires-python = ">=3.9"
-license = "LICENSE"
+license = {file = 'LICENSE'}
 keywords = ["batteries", "science", "data science"]
 authors = [
-    "Logan Ward <lward@anl.gov>",
-    "Noah Paulson <npaulson@anl.gov>",
-    "Joseph Kubal <kubal@anl.gov>"
+    {name = "Logan Ward", email = "lward@anl.gov"},
+    {name = "Noah Paulson", email = "lward@anl.gov"},
+    {name = "Joseph Kubal", email = "kubal@anl.gov"},
 ]
-repository = "https://github.com/materials-data-facility/battery-data-toolkit"
-packages = [
-    { include = "batdata" },
+dependencies = [
+    "pandas > 1.0",
+    "scipy > 1.3",
+    "pydantic < 2",
+    "tables > 3.6",
+    "h5py == 3.*",
+    "scythe-extractors >= 0.1",
+    "xlrd"
 ]
 
-[tool.poetry.dependencies]
-pandas = ">1.0"
-scipy = "^1.3"
-pydantic = "^1.7"
-tables = "^3.6"
-h5py = "^3"
-scythe-extractors = "^0.1"
-tqdm = "*"
-xlrd = "*"
+[tool.setuptools.packages.find]
+include = ["batdata*"]
 
-[tool.poetry.group.test.dependencies]
-pytest = "^6.0.0"
-pytest-cov = "*"
+[project.optional-dependencies]
+test = [
+    'flake8',
+    'pytest',
+    'pytest-cov'
+]
+
+[project.urls]
+repository = "https://github.com/rovi-org/battery-data-toolkit"
 
 [tool.poetry.scripts]
 batdata-convert = "batdata.cli:main"
-
-[build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"