From 4f67e0f73c3ee9ca77e54c112985f79cb5e0ed66 Mon Sep 17 00:00:00 2001 From: Scott Huberty Date: Sun, 12 May 2024 21:52:40 -0700 Subject: [PATCH 1/6] FIX: Make sure eegeyenet_urls.csv gets included in package data during static install The CSV file added in 957f98d isn't getting downloaded during static install. Might be because of the include_package_data flag, see https://stackoverflow.com/questions/7522250/how-to-include-package-data-with-setuptools-distutils --- pyproject.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 8abf8d0..0577a36 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -83,9 +83,6 @@ source = 'https://github.com/scott-huberty/EOGLearn' tracker = 'https://github.com/scott-huberty/EOGLearn/issues' # documentation = 'https://github.com/scott-huberty/EOGLearn/' -[tool.setuptools] -include-package-data = false - [tool.setuptools.packages.find] include = ['eoglearn*'] exclude = ['eoglearn*tests'] From 72e910dd48981f52c87dc346bf5f73b6a593c6d1 Mon Sep 17 00:00:00 2001 From: Scott Huberty Date: Sun, 12 May 2024 22:05:30 -0700 Subject: [PATCH 2/6] Revert "FIX: Make sure eegeyenet_urls.csv gets included in package data during static install" This reverts commit 4f67e0f73c3ee9ca77e54c112985f79cb5e0ed66. --- pyproject.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 0577a36..8abf8d0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -83,6 +83,9 @@ source = 'https://github.com/scott-huberty/EOGLearn' tracker = 'https://github.com/scott-huberty/EOGLearn/issues' # documentation = 'https://github.com/scott-huberty/EOGLearn/' +[tool.setuptools] +include-package-data = false + [tool.setuptools.packages.find] include = ['eoglearn*'] exclude = ['eoglearn*tests'] From e52a82288bb4bb0a8dc1505cbf6b877d22cf6e0e Mon Sep 17 00:00:00 2001 From: Scott Huberty Date: Sun, 12 May 2024 22:07:59 -0700 Subject: [PATCH 3/6] FIX: add CSV file to setuptools.package-data Also see https://stackoverflow.com/questions/69647590/specifying-package-data-in-pyproject-toml --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 8abf8d0..80cbd9f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ['setuptools >= 61.0.0'] +requires = ['setuptools >= 61.0.0', "setuptools-scm>=8.0"] build-backend = 'setuptools.build_meta' [project] @@ -91,7 +91,7 @@ include = ['eoglearn*'] exclude = ['eoglearn*tests'] # [tool.setuptools.package-data] -# "eoglearn" = ["assets/*"] +# "eoglearn" = ["assets/*", "datasets/eegeyenet_urls.csv"] [tool.black] line-length = 88 From 75341195ffff7c3d25d81ca69bfd0790e38870ff Mon Sep 17 00:00:00 2001 From: Scott Huberty Date: Sun, 12 May 2024 22:14:32 -0700 Subject: [PATCH 4/6] Set include-package-data to True --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 80cbd9f..289f7b5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -84,7 +84,7 @@ tracker = 'https://github.com/scott-huberty/EOGLearn/issues' # documentation = 'https://github.com/scott-huberty/EOGLearn/' [tool.setuptools] -include-package-data = false +include-package-data = True [tool.setuptools.packages.find] include = ['eoglearn*'] From d5368ab3063807aedd16f8186c0e27163d477d35 Mon Sep 17 00:00:00 2001 From: Scott Huberty Date: Sun, 12 May 2024 22:16:44 -0700 Subject: [PATCH 5/6] FIX: dont capitalize booleans? --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 289f7b5..cf461a3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -84,7 +84,7 @@ tracker = 'https://github.com/scott-huberty/EOGLearn/issues' # documentation = 'https://github.com/scott-huberty/EOGLearn/' [tool.setuptools] -include-package-data = True +include-package-data = true [tool.setuptools.packages.find] include = ['eoglearn*'] From e69d50a4054589c4b8a286bdf734deb0600927b0 Mon Sep 17 00:00:00 2001 From: Scott Huberty Date: Sun, 12 May 2024 22:24:23 -0700 Subject: [PATCH 6/6] Delete Commented lines --- pyproject.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index cf461a3..22ed3c8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -90,9 +90,6 @@ include-package-data = true include = ['eoglearn*'] exclude = ['eoglearn*tests'] -# [tool.setuptools.package-data] -# "eoglearn" = ["assets/*", "datasets/eegeyenet_urls.csv"] - [tool.black] line-length = 88 target-version = ['py39']