Merge pull request #31 from eslavich/eslavich-use-scm-version

Set use_scm_version=True in setup.py
spacetelescope · Aug 26, 2021 · 5f7d9ad · 5f7d9ad
2 parents a302720 + 9ce57dc
commit 5f7d9ad
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,7 +1,9 @@
-0.6.0 (Unreleased)
+0.5.2 (unreleased)
 ==================
 
-- Updated ENGINEERIGN value to F213 in optical_element. [#29]
+- Updated ENGINEERING value to F213 in optical_element. [#29]
+
+- Workaround for setuptools_scm issues with recent versions of pip. [#31]
 
 0.5.1 (2021-08-24)
 ==================

diff --git a/setup.cfg b/setup.cfg
@@ -26,8 +26,7 @@ install_requires =
     psutil>=5.7.2
     numpy>=1.16
     astropy>=4.0
-    #romanad>=0.5.0
-    romanad @ git+https://github.com/spacetelescope/rad.git@main
+    romanad>=0.6.1
 
 package_dir =
     =src

diff --git a/setup.py b/setup.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
 from setuptools import setup
 
-setup()
+# This should be enabled by pyproject.toml, but that doesn't seem
+# to work with pip 21.2.4.
+setup(use_scm_version={"write_to": "src/roman_datamodels/_version.py"})