PyPI no longer supports GPG-signed uploads

rseichter · Feb 2, 2024 · 50067cd · 50067cd
1 parent 567ac26
commit 50067cd
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 19 deletions.
diff --git a/contrib/package.sh b/contrib/package.sh
@@ -26,23 +26,16 @@ function do_dist() {
 }
 
 function do_upload() {
-	if [ $# -gt 0 ]; then
-		repo="$1"
-	fi
-	local opt=(
-		'-sign'
-		'-i'
-		'D3DCBBA4EFA680A1C5C85708593AAE2E98E2219D'
-		'-r'
-		"${repo:-testpypi}"
-	)
-	twine upload "${opt[@]}" dist/*
+	twine upload dist/*
 }
 
 function do_setver() {
 	[ $# -gt 0 ] || usage
-	/usr/bin/sed -i '' -E -e "s/^v[^,]+, {docdate.+/v${1}, {docdate}/" docs/fangfrisch.adoc
-	/usr/bin/sed -i '' -E -e "s/^__version.+/__version__ = '${1}'/" fangfrisch/__init__.py
+	local sed="/usr/bin/sed -E"
+	set -x
+	${sed} -i "" -e "s/^v[^ ]+ {docdate}$/v${1}, {docdate}/" docs/fangfrisch.adoc
+	${sed} -i "" -e "s/^__version.+/__version__ = '${1}'/" fangfrisch/__init__.py
+	set +x
 }
 
 [ $# -gt 0 ] || usage

diff --git a/docs/fangfrisch.adoc b/docs/fangfrisch.adoc
@@ -1,6 +1,6 @@
 # Fangfrisch
 Ralph Seichter <fangfrisch@seichter.de>
-1.7.0.dev2, {docdate}
+v1.7.0.dev3, {docdate}
 :copyright: © 2020-2024 Ralph Seichter
 :encoding: UTF-8
 :hyphens: en

diff --git a/docs/fangfrisch.pdf b/docs/fangfrisch.pdf
diff --git a/docs/index.html b/docs/index.html
@@ -442,8 +442,8 @@ <h1>Fangfrisch</h1>
 <div class="details">
 <span id="author" class="author">Ralph Seichter</span><br>
 <span id="email" class="email"><a href="mailto:[email protected]">[email protected]</a></span><br>
-<span id="revnumber">version 1.7.0.dev1,</span>
-<span id="revdate">2024-01-30</span>
+<span id="revnumber">version 1.7.0.dev3,</span>
+<span id="revdate">2024-02-02</span>
 </div>
 <div id="toc" class="toc2">
 <div id="toctitle">Table of Contents</div>
@@ -1228,8 +1228,8 @@ <h3 id="_accessing_mappings"><a class="anchor" href="#_accessing_mappings"></a>C
 </div>
 <div id="footer">
 <div id="footer-text">
-Version 1.7.0.dev1<br>
-Last updated 2024-01-30 22:27:04 +0100
+Version 1.7.0.dev3<br>
+Last updated 2024-02-02 20:37:07 +0100
 </div>
 </div>
 </body>

diff --git a/fangfrisch/__init__.py b/fangfrisch/__init__.py
@@ -16,7 +16,7 @@
 You should have received a copy of the GNU General Public License
 along with Fangfrisch. If not, see <https://www.gnu.org/licenses/>.
 """
-__version__ = '1.7.0.dev2'
+__version__ = '1.7.0.dev3'
 
 
 class ClamavItem: