wholetrans/docs-matrix-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'travis/towncrier2' into travis/towncrier

Browse source
This commit is contained in:
Travis Ralston 2018-07-12 10:23:17 -06:00
commit bc29f2a8c8
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -2,7 +2,7 @@ language: go
go: go:
- 1.8 - 1.8
sudo: false sudo: required
# we only need a single git commit # we only need a single git commit
git: git:

15
scripts/templating/matrix_templates/units.py
View file

@ -30,9 +30,8 @@ import re
import subprocess import subprocess
import sys import sys
import yaml import yaml
import requests.utils
from functools import reduce from functools import reduce
from six.moves.urllib.parse import urlencode from six.moves.urllib.parse import urlencode, quote
matrix_doc_dir=reduce(lambda acc,_: os.path.dirname(acc), matrix_doc_dir=reduce(lambda acc,_: os.path.dirname(acc),
range(1, 5), os.path.abspath(__file__)) range(1, 5), os.path.abspath(__file__))
@ -525,7 +524,7 @@ class MatrixUnits(Units):
if param_loc == "path": if param_loc == "path":
path_template = path_template.replace( path_template = path_template.replace(
"{%s}" % param_name, requests.utils.requote_uri(example) "{%s}" % param_name, quote(example)
) )
elif param_loc == "query": elif param_loc == "query":
if type(example) == list: if type(example) == list:
@ -839,21 +838,21 @@ class MatrixUnits(Units):
tc_lines = [] tc_lines = []
if os.path.isdir(tc_path): if os.path.isdir(tc_path):
logger.info("Generating towncrier changelog for: %s" % name) logger.info("Generating towncrier changelog for: %s" % name)
p = subprocess.run( p = subprocess.Popen(
['towncrier', '--version', 'Unreleased Changes', '--name', name, '--draft'], ['towncrier', '--version', 'Unreleased Changes', '--name', name, '--draft'],
cwd=tc_path, cwd=tc_path,
check=False, # We'll manually check the exit code
stderr=subprocess.PIPE, stderr=subprocess.PIPE,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
) )
stdout, stderr = p.communicate()
if p.returncode != 0: if p.returncode != 0:
# Something broke - dump as much information as we can # Something broke - dump as much information as we can
logger.error("Towncrier exited with code %s" % p.returncode) logger.error("Towncrier exited with code %s" % p.returncode)
logger.error(p.stdout.decode('UTF-8')) logger.error(stdout.decode('UTF-8'))
logger.error(p.stderr.decode('UTF-8')) logger.error(stderr.decode('UTF-8'))
raw_log = "" raw_log = ""
else: else:
raw_log = p.stdout.decode('UTF-8') raw_log = stdout.decode('UTF-8')
# This is a bit of a hack, but it does mean that the log at least gets *something* # This is a bit of a hack, but it does mean that the log at least gets *something*
# to tell us it broke # to tell us it broke