From 675b3e060d82366da7d6c400b0d2fefe695313da Mon Sep 17 00:00:00 2001 From: Althea Denlinger Date: Wed, 17 Jul 2024 16:17:13 -0600 Subject: [PATCH 1/2] Add `MANIFEST.in` --- MANIFEST.in | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 00000000..48b468a3 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,6 @@ +include mache/cime_machine_config/*.xml +include mache/machines/*.cfg +include mache/spack/*.yaml +include mache/spack/*.template +include mache/spack/*.sh +include mache/spack/*.csh From 15459c25bd0f7acaabb924edc9cac49460f4982c Mon Sep 17 00:00:00 2001 From: Althea Denlinger Date: Wed, 17 Jul 2024 16:17:30 -0600 Subject: [PATCH 2/2] Remove all references to `setuptools-scm` --- conda/meta.yaml | 1 - pyproject.toml | 5 +---- spec-file.txt | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/conda/meta.yaml b/conda/meta.yaml index 19d820be..643e41fa 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -17,7 +17,6 @@ requirements: - python >=3.8 - pip - setuptools >=60 - - setuptools-scm >=8.0 run: - python >=3.8 - importlib_resources diff --git a/pyproject.toml b/pyproject.toml index 9d81bde7..b1ae0d8d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -66,10 +66,7 @@ warn_redundant_casts = true warn_unused_configs = true [build-system] -requires = [ - "setuptools>=60", - "setuptools-scm>=8.0", -] +requires = ["setuptools>=60"] build-backend = "setuptools.build_meta" [tool.setuptools.packages.find] diff --git a/spec-file.txt b/spec-file.txt index 50b47214..108ac1b9 100644 --- a/spec-file.txt +++ b/spec-file.txt @@ -8,7 +8,6 @@ rsync # Building setuptools >=60 -setuptools-scm >=8.0 # Linting and testing pip