Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix errors on AppVeyor by updating pip packages #2141

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,13 @@ install:
- C:\msys64\usr\bin\bash -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig"
- C:\msys64\usr\bin\bash -lc "pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig"
- C:\msys64\usr\bin\bash -lc "pacman -U --noconfirm msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz"
- ps: Get-Process | Where-Object {$_.path -like 'C:\msys64*'} | Stop-Process
# Update zstd and pacman https://github.com/msys2/MSYS2-packages/issues/2300
- C:\msys64\usr\bin\bash -lc "pacman --noconfirm --upgrade https://repo.msys2.org/msys/x86_64/zstd-1.4.7-1-x86_64.pkg.tar.xz"
- C:\msys64\usr\bin\bash -lc "pacman --noconfirm --upgrade https://repo.msys2.org/msys/x86_64/pacman-5.2.2-5-x86_64.pkg.tar.xz"
- C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -Sy pacman-mirrors"
- C:\msys64\usr\bin\bash -lc "pacman --noconfirm -Su"
- C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S autoconf automake bison flex git"
- C:\msys64\usr\bin\bash -lc "pacman --noconfirm -Syuu"
- ps: Get-Process | Where-Object {$_.path -like 'C:\msys64*'} | Stop-Process
- C:\msys64\usr\bin\bash -lc "pacman --noconfirm -Sy autoconf automake bison flex git"
- C:\msys64\usr\bin\bash -lc "pip3 install --upgrade pipenv"
- C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER/docs && pipenv sync"

Expand Down
201 changes: 127 additions & 74 deletions docs/Pipfile.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions docs/build_manpage.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
# Prevent our markdown parser from trying to help by interpreting things in angle brackets as HTML tags.
class EscapeHtml(Extension):
def extendMarkdown(self, md, md_globals):
del md.preprocessors['html_block']
del md.inlinePatterns['html']
md.preprocessors.deregister('html_block')
md.inlinePatterns.deregister('html')

class RoffWalker(object):
def __init__(self, tree, output=sys.stdout):
Expand Down Expand Up @@ -187,7 +187,7 @@ def __write_raw(self, dat):

def load_yml_file(fn):
with open(fn) as f:
return yaml.load(f)
return yaml.load(f, Loader=yaml.BaseLoader)

def dedent_body(body):
lines = [re.sub(r'^ (\S)', r'\1', l) for l in body.split('\n')]
Expand Down
2 changes: 1 addition & 1 deletion docs/build_mantests.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import yaml

with open("content/manual/manual.yml") as f:
manual = yaml.load(f)
manual = yaml.load(f, Loader=yaml.BaseLoader)
for section in manual.get('sections', []):
for entry in section.get('entries', []):
for example in entry.get('examples', []):
Expand Down
2 changes: 1 addition & 1 deletion docs/build_website.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

def load_yml_file(fn):
with open(fn) as f:
return yaml.load(f)
return yaml.load(f, Loader=yaml.BaseLoader)

env.filters['search_id'] = lambda input: input.replace(r'`', '')
env.filters['section_id'] = lambda input: re.sub(r"[^a-zA-Z0-9_]", '', input)
Expand Down
1 change: 1 addition & 0 deletions docs/content/manual/v1.5/manual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1970,6 +1970,7 @@ sections:
STRING | FILTER( [REGEX, FLAGS] )

where:

* STRING, REGEX and FLAGS are jq strings and subject to jq string interpolation;
* REGEX, after string interpolation, should be a valid PCRE regex;
* FILTER is one of `test`, `match`, or `capture`, as described below.
Expand Down
1 change: 1 addition & 0 deletions docs/content/manual/v1.6/manual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2216,6 +2216,7 @@ sections:
STRING | FILTER( [REGEX, FLAGS] )

where:

* STRING, REGEX and FLAGS are jq strings and subject to jq string interpolation;
* REGEX, after string interpolation, should be a valid PCRE regex;
* FILTER is one of `test`, `match`, or `capture`, as described below.
Expand Down