Merge pull request #179 from altheaden/fix-setuptools-CI

Fix setuptools on conda-forge feedstock
E3SM-Project · Jul 18, 2024 · 82466ae · 82466ae
2 parents 8ff3fdd + 15459c2
commit 82466ae
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/MANIFEST.in 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
diff --git 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
@@ -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
@@ -8,7 +8,6 @@ rsync
 
 # Building
 setuptools >=60
-setuptools-scm >=8.0
 
 # Linting and testing
 pip