From 22abecbd8ec5e92479cc34ca1149a999da91dd4b Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Jun 19 2023 17:17:55 +0000
Subject: Update release script and changelog for new release


Signed-off-by: Adam Williamson <awilliam@redhat.com>

---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb68b76..7378fa8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 ## Changelog
 
+### 3.0.0 - 2023-06-19
+
+*   [resultsdb_conventions-3.0.0.tar.gz](https://files.pythonhosted.org/packages/source/r/resultsdb-conventions/resultsdb_conventions-3.0.0.tar.gz)
+
+1.  **API**: Support ELN compose results
+
+This is an API change as it changes the name of an argument to `FedoraComposeResult` and
+`FedoraImageResult` from `cid` to `locator`. This is because, for ELN, this needs to be
+the URL, not the compose ID; we cannot find ELN composes by compose ID.
+
 ### 2.1.0 - 2020-08-27
 
 *   [resultsdb_conventions-2.1.0.tar.gz](https://files.pythonhosted.org/packages/source/r/resultsdb-conventions/resultsdb_conventions-2.1.0.tar.gz)
diff --git a/release.sh b/release.sh
index cb97fab..98cc490 100755
--- a/release.sh
+++ b/release.sh
@@ -2,10 +2,7 @@
 
 baddeps=""
 # check deps
-rpm -qi python3-setuptools > /dev/null 2>&1 || baddeps="python3-setuptools"
-rpm -qi python3-setuptools_git > /dev/null 2>&1 || baddeps="${baddeps} python3-setuptools_git"
-rpm -qi python3-pypandoc > /dev/null 2>&1 || baddeps="${baddeps} python3-pypandoc"
-rpm -qi twine > /dev/null 2>&1 || baddeps="${baddeps} twine"
+python3 -m build.__init__ || baddeps="python3-build"
 if [ -n "${baddeps}" ]; then
     echo "${baddeps} must be installed!"
     exit 1
@@ -18,13 +15,12 @@ fi
 
 version=$1
 name=resultsdb_conventions
-sed -i -e "s,version = \".*\",version = \"${version}\", g" setup.py
-sed -i -e "s,__version__ = \".*\",__version__ = \"${version}\", g" ${name}/__init__.py
-git add setup.py ${name}/__init__.py
+sed -i -e "s,version=\".*\",version=\"${version}\", g" setup.py
+sed -i -e "s,__version__ = \".*\",__version__ = \"${version}\", g" src/${name}/__init__.py
+git add setup.py src/${name}/__init__.py
 git commit -s -m "Release ${version}"
 git push
 git tag -a -m "Release ${version}" ${version}
 git push origin ${version}
-python3 ./setup.py sdist --formats=tar
-gzip dist/${name}-${version}.tar
-twine upload -r pypi dist/${name}-${version}.tar.gz
+python3 -m build .
+twine upload -r pypi dist/${name}-${version}*