Always use GitHub-CLI for public release to GitHub.

Remove the 'github_curl' and 'github_python' methods of pushing a
release to GitHub -- these should no longer be needed now that
GitHub-CLI is available.

The 'public_release' ODK option should now be set to the name of the
hosting service for releases. For now, the only supported option is
'github' (which, in effect, is exactly as before). The older values
'github_curl' and 'github_python' are silently transformed into
'github'.

To accomodate for that change:

(1) GitHub-CLI (`gh`) is moved from ODKFull to ODKLite;

(2) conversely, PyGithub (which was only used for the `github_python`
    method) is moved from ODKLite to ODKFull (it is not completely
    *removed*, since people may have custom workflows that depend on
    it).

closes #1296

Author: gouttegd

Dockerfile

@@ -36,7 +36,6 @@ RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y --no-i
     libbusiness-isbn-perl \
     pkg-config \
     xlsx2csv \
-    gh \
     nodejs \
     npm \
     graphviz \

docker/odklite/Dockerfile

@@ -36,7 +36,8 @@ RUN apt-get update && \
         rsync \
         time \
         sudo \
-        sqlite3
+        sqlite3 \
+        gh
 
 # Install Python environment (copied over from the builder image).
 COPY --from=obolibrary/odkbuild:latest /staging/lite /
@@ -107,7 +108,7 @@ RUN sed -i s/@@ODK_IMAGE_VERSION@@/$ODK_VERSION/ /tools/odk-info
 COPY --chmod=755 scripts/update_repo.sh /tools/update_repo
 
 # Install the ODK itself.
-COPY --chmod=755 odk/make-release-assets.py odk/odk.py /tools
+COPY --chmod=755 odk/odk.py /tools
 COPY template/ /tools/templates/
 CMD python3 /tools/odk.py
 COPY resources/obo.epm.json /tools

odk/make-release-assets.py

@@ -765,8 +765,8 @@ class OntologyProject(JsonSchemaMixin):
     use_context: bool = False
     """If True, a context file is created that allows the user to specify prefixes used across the project."""
 
-    public_release : str = "none"
-    """if true add functions to run automated releases (experimental). Current options are: github_curl, github_python."""
+    public_release : Optional[str] = None
+    """Add supports for automatically pushing releases to the hosting service. Currently the only supported option is 'github'."""
 
     public_release_assets : Optional[List[str]] = None
     """A list of files that gets added to a github/gitlab/etc release (as assets). If this option is not set (None), the standard ODK assets will be deployed."""
@@ -909,6 +909,10 @@ def fill_missing(self):
                 self.robot.obo_format_options += ' '
             self.robot.obo_format_options += '--clean-obo "strict drop-untranslatable-axioms"'
 
+        # Backwards compatibility support for deprecated 'public_release' settings
+        if self.public_release == 'github_curl' or self.public_release == 'github_python':
+            self.public_release = 'github'
+
 @dataclass
 class ExecutionContext(JsonSchemaMixin):
     """

odk/odk.py

@@ -6,7 +6,6 @@ dataclasses-jsonschema
 jinja2
 jsonpath_rw
 jsonschema
-PyGithub
 pyyaml
 ruamel.yaml
 dosdp

requirements.txt.lite

@@ -1507,69 +1507,35 @@ $(ONT)-basic.owl: $(EDIT_PREPROCESSED) $(OTHER_SRC) $(SIMPLESEED) $(KEEPRELATION
 explain_unsat: $(EDIT_PREPROCESSED) 
 	$(ROBOT) explain -i $< -M unsatisfiability --unsatisfiable random:10 --explanation $(TMPDIR)/[email protected]
 
-{%- if project.public_release != 'none'  %}
+{% if project.public_release == 'github' -%}
 # ----------------------------------------
-# GitHub release (HIGHLY experimental)
+# GitHub release
 # ----------------------------------------
 
-RELEASEFILES={% if project.public_release_assets is not none -%}{% for gha in project.public_release_assets %} {{ gha }}{% endfor -%}{% else -%}$(ASSETS){% endif %}
-TAGNAME=v$(TODAY)
-{% endif %}
-
-{% if project.public_release == 'github_curl'  %}
-USER=unknown
-GH_ASSETS = $(patsubst %, $(TMPDIR)/gh_release_asset_%.txt, $(RELEASEFILES))
-GITHUB_REPO={{ project.github_org }}/{{ project.repo }}
-
-$(TMPDIR)/release_get.txt: | $(TMPDIR)
-	curl -s https://api.github.com/repos/${GITHUB_REPO}/releases/tags/${TAGNAME} > $@
-
-$(TMPDIR)/release_op.txt: $(TMPDIR)/release_get.txt | $(TMPDIR)
-	$(eval RELEASEID=$(shell cat $(TMPDIR)/release_get.txt | jq '.id'))
-	if ! [ "$(RELEASEID)" -eq "$(RELEASEID)" ] ; then \
-		curl -s -X POST \
-			https://api.github.com/repos/${GITHUB_REPO}/releases \
-			-H 'Accept: */*' \
-			-H 'Content-Type: application/json' \
-			-u ${USER} \
-			-d '{ "tag_name": "${TAGNAME}", "target_commitish": "master", "name": "${TAGNAME}", "body": "Ontology release ${TODAY}", "draft": false, "prerelease": false }' > $@; \
-	else \
-		cp $< $@; \
-	fi;
-
-$(TMPDIR)/gh_release_id.txt: $(TMPDIR)/release_op.txt | $(TMPDIR)
-	echo $(shell cat $(TMPDIR)/release_op.txt | jq '.id') > $@;
-
-$(TMPDIR)/gh_release_asset_%.txt: $(TMPDIR)/gh_release_id.txt % | $(TMPDIR)
-	curl -X POST \
-		"https://uploads.github.com/repos/${GITHUB_REPO}/releases/$(shell cat $(TMPDIR)/gh_release_id.txt)/assets?name=$*&label=$*" \
-		--data-binary @$* \
-		-u ${USER} \
-		-H 'Accept: */*' \
-		-H 'Cache-Control: no-cache' \
-		-H 'Connection: keep-alive' \
-		-H 'Content-Type: application/octet-stream' > $@
-
-public_release: $(TMPDIR)/gh_release_id.txt $(GH_ASSETS) | $(TMPDIR)
-{% endif %}
-{%- if project.public_release == 'github_python'  %}
-GITHUB_RELEASE_PYTHON=make-release-assets.py
+GHVERSION=v$(VERSION)
 
 .PHONY: public_release
 public_release:
-	ls -alt $(ASSETS)
-	$(GITHUB_RELEASE_PYTHON) --release $(TAGNAME) $(RELEASEFILES)
-{% else  %}
+	@echo "Pushing public release $(GHVERSION)..."
+	@ls -alt $(RELEASE_ASSETS_AFTER_RELEASE)
+	@gh release create $(GHVERSION) \
+		           --title "$(VERSION) Release" \
+		           --generate-notes \
+		           $(RELEASE_ASSETS_AFTER_RELEASE)
 
-GHVERSION=v$(VERSION)
+{% else -%}
+# ----------------------------------------
+# Public release
+# ----------------------------------------
 
 .PHONY: public_release
 public_release:
-	@test $(GHVERSION)
-	ls -alt $(RELEASE_ASSETS_AFTER_RELEASE)
-	gh release create $(GHVERSION) --title "$(VERSION) Release" --draft $(RELEASE_ASSETS_AFTER_RELEASE) --generate-notes
+	@echo "ERROR: No release management system configured (or system unsupported)."
+	@echo "       Fix your configuration or override this target with a custom"
+	@echo "       public release workflow in {{ project.id }}.Makefile."
+	@false
 
-{%- endif %}
+{% endif -%}
 
 # ----------------------------------------
 # General Validation