Change name to fiaas-publish, and use githubrelease library

Author: mortenlj

README.rst

@@ -28,7 +28,6 @@ In order to use publish, you must first install it::
 
 Under the covers, publish uses github-release_ and twine_ to do most of the work, and those tools require credentials for Github and PyPI to be available in environment variables::
 
-    export GITHUB_USER=gh-user
     export GITHUB_TOKEN=gh-token
     export TWINE_USERNAME=pypi-user
     export TWINE_PASSWORD=pypi-pass
@@ -47,5 +46,5 @@ Before uploading anything, publish will verify that the current checkout is suit
 
 If the answer to all of these is yes, the name of the tag is used as the version to release. A changelog is generated from the git log, source tarballs and wheels are built, the release is created in Github and PyPI, and the files are uploaded.
 
-.. _github-release: https://github.com/aktau/github-release
+.. _github-release: https://github.com/j0057/github-release
 .. _twine: https://github.com/pypa/twine

get_github_release.py

@@ -13,23 +13,22 @@
 - Check if the build refers exactly to an annotated tag following the convention above
 - Generate a suitable changelog
 - Create packages for upload (wheels and tarballs)
-- Use https://github.com/aktau/github-release to create a Github release
+- Use https://github.com/j0057/github-release to create a Github release
 - Use the projects setup.py to create a PyPi release (using Twine for upload)
 """
 from __future__ import unicode_literals, print_function
 
 import argparse
-import subprocess
-
 import os
 import re
-import six
+import subprocess
 import sys
 import tempfile
+
+import six
 from git import Repo, BadName, GitCommandError
 from git.cmd import Git
-
-from get_github_release import get_github_release
+from github_release import gh_release_create
 
 # Magical, always present, empty tree reference
 # https://stackoverflow.com/questions/9765453/
@@ -118,7 +117,7 @@ def _shorten(self, sha):
 class Uploader(object):
     def __init__(self, options, version, changelog, artifacts):
         self.dry_run = options.dry_run
-        self.repo = options.repository
+        self.repo = "{}/{}".format(options.organization, options.repository)
         self.version = version
         self.changelog = changelog
         self.artifacts = artifacts
@@ -139,20 +138,10 @@ def _call(self, *args, **kwargs):
 
     def github_release(self):
         """Create release in github, and upload artifacts and changelog"""
-        gh_path = get_github_release()
-        self._call(gh_path, "release",
-                   "--repo", self.repo,
-                   "--tag", self.version,
-                   "--description", format_gh_changelog(self.changelog),
-                   msg="Failed to create release on Github")
-        for artifact in self.artifacts:
-            name = os.path.basename(artifact)
-            self._call(gh_path, "upload",
-                       "--repo", self.repo,
-                       "--tag", self.version,
-                       "--name", name,
-                       "--file", artifact,
-                       msg="Failed to upload artifact {} to Github".format(name))
+        gh_release_create(
+            self.repo, self.version, self.artifacts,
+            body=format_gh_changelog(self.changelog), publish=True, dry_run=self.dry_run
+        )
 
     def pypi_release(self):
         """Create release in pypi.python.org, and upload artifacts and changelog"""

publish.py

@@ -5,22 +5,23 @@
 from setuptools import setup
 
 GENERIC_REQ = [
-    "six==1.11.0",
+    "six==1.12.0",
     'GitPython==2.1.11',
-    "twine==1.12.1"
+    "twine==1.12.1",
+    "githubrelease==1.5.8",
 ]
 
 CODE_QUALITY_REQ = [
     'prospector',
 ]
 
 TESTS_REQ = [
-    'tox==3.4.0',
+    'tox==3.6.1',
     'mock==2.0.0',
-    'pytest==3.8.2',
+    'pytest==4.0.2',
     'pytest-cov==2.6.0',
     'pytest-html==1.19.0',
-    'pytest-sugar==0.9.1',
+    'pytest-sugar==0.9.2',
 ]
 
 
@@ -46,7 +47,7 @@ def _read(filename):
 
 def main():
     setup(
-        name="publish",
+        name="fiaas-publish",
         author="FiaaS developers",
         author_email="fiaas@googlegroups.com",
         use_scm_version=True,
@@ -89,8 +90,7 @@ def main():
         # Entrypoints
         entry_points={
             "console_scripts": [
-                "publish=publish:main",
-                "get_github_release=get_github_release:main"
+                "publish=publish:main"
             ]
         }