From 78f36b18225d4b002f1c68819f711cab5f52c4dc Mon Sep 17 00:00:00 2001
From: Caden Myers <cjm2304@columbia.edu>
Date: Tue, 1 Oct 2024 10:48:20 -0400
Subject: [PATCH 1/3] AUTHORS, MANIFEST, pyproject files

---
 AUTHORS.rst    |  2 +-
 MANIFEST.in    | 26 ++++++++++++--------------
 pyproject.toml |  9 ++++++---
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/AUTHORS.rst b/AUTHORS.rst
index bd304e7..80a0c80 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -1,7 +1,7 @@
 Authors
 =======
 
-Billinge Group and community contibutors.
+Billinge Group and community contributors.
 
 Contributors
 ------------
diff --git a/MANIFEST.in b/MANIFEST.in
index 4c3546c..f1a78ee 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,14 +1,12 @@
-include AUTHORS.rst
-include LICENSE
-include README.rst
-include requirements.txt
-
-recursive-exclude * __pycache__
-recursive-exclude * *.py[co]
-
-recursive-include docs *.rst conf.py Makefile make.bat
-
-include diffpy.fourigui/version.py
-
-# If including data files in the package, add them like:
-# include path/to/data_file
+graft src
+graft tests
+graft requirements
+
+include AUTHORS.rst LICENSE*.rst README.rst
+
+# Exclude all bytecode files and __pycache__ directories
+global-exclude *.py[cod]  # Exclude all .pyc, .pyo, and .pyd files.
+global-exclude .DS_Store  # Exclude Mac filesystem artifacts.
+global-exclude __pycache__  # Exclude Python cache directories.
+global-exclude .git*  # Exclude git files and directories.
+global-exclude .idea  # Exclude PyCharm project settings.
diff --git a/pyproject.toml b/pyproject.toml
index 498f3ee..61b906c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,10 +1,10 @@
 [build-system]
-requires = ["setuptools>=62.0", "setuptools-git-versioning<2"]
+requires = ["setuptools>=62.0", "setuptools-git-versioning>=2.0"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "diffpy.fourigui"
-dynamic=['version']
+dynamic=['version', 'dependencies']
 authors = [
   { name="Simon J.L. Billinge group", email="simon.billinge@gmail.com" },
 ]
@@ -45,9 +45,12 @@ dirty_template = "{tag}"
 [tool.setuptools.packages.find]
 where = ["src"]  # list of folders that contain the packages (["."] by default)
 include = ["*"]  # package names should match these glob patterns (["*"] by default)
-exclude = ["diffpy.fourigui.tests*"]  # exclude packages matching these glob patterns (empty by default)
+exclude = []  # exclude packages matching these glob patterns (empty by default)
 namespaces = false  # to disable scanning PEP 420 namespaces (true by default)
 
+[tool.setuptools.dynamic]
+dependencies = {file = ["requirements/run.txt"]}
+
 [tool.black]
 line-length = 115
 include = '\.pyi?$'

From 8306ff1db4f4e1b6ead98b87a2837fde3a3bb1c1 Mon Sep 17 00:00:00 2001
From: Caden Myers <cjm2304@columbia.edu>
Date: Tue, 1 Oct 2024 10:49:19 -0400
Subject: [PATCH 2/3] requirements directory

---
 requirements/build.txt | 2 --
 requirements/test.txt  | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/requirements/build.txt b/requirements/build.txt
index f72d870..e69de29 100644
--- a/requirements/build.txt
+++ b/requirements/build.txt
@@ -1,2 +0,0 @@
-python
-setuptools
diff --git a/requirements/test.txt b/requirements/test.txt
index 6f9ccf8..a727786 100644
--- a/requirements/test.txt
+++ b/requirements/test.txt
@@ -2,4 +2,5 @@ flake8
 pytest
 codecov
 coverage
+pytest-cov
 pytest-env

From 1afd6f93c9360312f6c92ebfc6e628379db0f418 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Tue, 1 Oct 2024 14:50:11 +0000
Subject: [PATCH 3/3] [pre-commit.ci] auto fixes from pre-commit hooks

---
 src/diffpy/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/diffpy/__init__.py b/src/diffpy/__init__.py
index 586be9d..4d4bf70 100644
--- a/src/diffpy/__init__.py
+++ b/src/diffpy/__init__.py
@@ -21,4 +21,3 @@
 __path__ = extend_path(__path__, __name__)
 
 # End of file
-