From 38d091e708fa57a47330c75263c372361a51eabe Mon Sep 17 00:00:00 2001
From: Ahmed Abdulkadir <ahmed.abdulkadir@pennmedicine.upenn.edu>
Date: Fri, 18 Feb 2022 00:26:30 +0000
Subject: [PATCH 1/3] Handle package name properly

---
 pyproject.toml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 888a5cead..3e5df5b4c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -16,7 +16,10 @@ authors = [
 keywords = ["neuro-imaging", "MRI", "big data"]
 
 readme = "README.md"
-include = ["NiBAx/plugins/data/MUSE_ROI_Dictionary.csv"]
+packages = [
+    {include = "NiBAx"},
+    {include = "NiBAx/plugins/data/MUSE_ROI_Dictionary.csv"},
+]
 
 [tool.poetry.dependencies]
 python = ">=3.8,<3.11"

From aea49b726fa47295cca0cd4d10fd7fea6e912f9f Mon Sep 17 00:00:00 2001
From: Ahmed Abdulkadir <ahmed.abdulkadir@pennmedicine.upenn.edu>
Date: Fri, 18 Feb 2022 00:34:29 +0000
Subject: [PATCH 2/3] Fix camel case module name

---
 NiBAx/plugins/agetrends/agetrends.yapsy-plugin | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NiBAx/plugins/agetrends/agetrends.yapsy-plugin b/NiBAx/plugins/agetrends/agetrends.yapsy-plugin
index a0a51a61d..da1129521 100644
--- a/NiBAx/plugins/agetrends/agetrends.yapsy-plugin
+++ b/NiBAx/plugins/agetrends/agetrends.yapsy-plugin
@@ -1,6 +1,6 @@
 [Core]
 Name = Age Trends
-Module = ageTrends
+Module = agetrends
 
 [Documentation]
 Author = Ashish Singh

From e3161ab7f4b8ce2940527dc19d0ee9fb07da18b2 Mon Sep 17 00:00:00 2001
From: Ahmed Abdulkadir <ahmed.abdulkadir@pennmedicine.upenn.edu>
Date: Fri, 18 Feb 2022 10:28:48 +0000
Subject: [PATCH 3/3] Remove dependency on setup.cfg

Fix #161
---
 README.md      |  3 ++-
 pyproject.toml | 12 ++++++++----
 setup.cfg      | 48 ------------------------------------------------
 3 files changed, 10 insertions(+), 53 deletions(-)
 delete mode 100644 setup.cfg

diff --git a/README.md b/README.md
index 0d379394e..5f8a48a72 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,8 @@ desired version, use one of the following commands to install it.
 
 ```shell
 # Editable version for development after cloning https://github.com/CBICA/NiBAx.git 
-python -m pip install -U -e . 
+python -m pip install -U -e .
+poetry install
 
 # Version from pull request (#57 in this example) for testing proposed changes
 python -m pip install -U git+https://github.com/CBICA/NiBAx.git@refs/pull/57/head
diff --git a/pyproject.toml b/pyproject.toml
index 3e5df5b4c..ace6d5bd3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,7 @@
 [build-system]
-requires = ["setuptools", "wheel", "poetry>=1.0.0"]
+requires = ["setuptools", "wheel", "poetry-core @ git+https://github.com/python-poetry/poetry-core.git@master"]
 #build-backend = "setuptools.build_meta"
-build-backend = "poetry.masonry.api"
+build-backend = "poetry.core.masonry.api"
 
 
 [tool.poetry]
@@ -16,9 +16,13 @@ authors = [
 keywords = ["neuro-imaging", "MRI", "big data"]
 
 readme = "README.md"
+
+include = ["NiBAx/plugins/data/MUSE_ROI_Dictionary.csv",
+           "NiBAx/**/*.ui",
+           "NiBAx/**/*.yapsy-plugin",
+           "*.png"]
 packages = [
-    {include = "NiBAx"},
-    {include = "NiBAx/plugins/data/MUSE_ROI_Dictionary.csv"},
+    {include = "NiBAx"}
 ]
 
 [tool.poetry.dependencies]
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 61d3fe6ee..000000000
--- a/setup.cfg
+++ /dev/null
@@ -1,48 +0,0 @@
-[metadata]
-name = NiBAx
-version = 0.1
-author = Ahmed Abdulkadir and Ashish Singh
-author_email = ahmed.abdulkadir@pennmedicine.upenn.edu
-description = BrainChart Utility and Analysis Package
-long_description = file: README.md
-long_description_content_type = text/markdown
-url = https://github.com/CBICA/NiBAx
-project_urls =
-    Bug Tracker = https://github.com/CBICA/BrainChart/issues
-classifiers =
-    Programming Language :: Python :: 3
-    Operating System :: OS Independent
-
-[options]
-packages = find:
-python_requires = >=3.8
-include_package_data = True
-install_requires = 
-                cycler==0.10.0
-                #dtale==1.61.1
-                joblib==1.0.1
-                matplotlib>=3.4.2
-                nibabel==3.2.1
-                numpy>=1.21
-                neuroHarmonize==2.1
-                pandas==1.3.4
-                Pillow>=9.0.0
-                pyparsing==2.4.7
-                PyQt5>=5.15.4
-                PyQt5_Qt5==5.15.2
-                PyQt5_sip==12.9.0
-                dill==0.3.4
-                future==0.18.2
-                python_dateutil==2.8.1
-                pytz==2021.1
-                scikit_learn>=1.0.2
-                scipy>=1.6.3
-                seaborn==0.11.1
-                six==1.16.0
-                statsmodels==0.13.0
-                wheel>=0.37.1
-                Yapsy==1.12.2
-
-[options.package_data]
-* = *.ui, *.yapsy-plugin, *.png
-muse_dict = MUSE_ROI_Dictionary.csv