Skip to content

Commit f7ea84d

Browse files
committed
Merge branch 'master' into format-nongpl
2 parents 7ecdbcd + 6bf9002 commit f7ea84d

File tree

6 files changed

+19
-7
lines changed

6 files changed

+19
-7
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ python:
88
- 3.5
99
- 3.6
1010
- 3.7
11+
- 3.8
1112
- pypy
1213
- pypy3
1314

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jsonschema
1212
:alt: Supported Python versions
1313
:target: https://pypi.org/project/jsonschema/
1414

15-
.. |Travis| image:: https://travis-ci.org/Julian/jsonschema.svg?branch=master
15+
.. |Travis| image:: https://travis-ci.com/Julian/jsonschema.svg?branch=master
1616
:alt: Travis build status
17-
:target: https://travis-ci.org/Julian/jsonschema
17+
:target: https://travis-ci.com/Julian/jsonschema
1818

1919
.. |AppVeyor| image:: https://ci.appveyor.com/api/projects/status/adtt0aiaihy6muyn/branch/master?svg=true
2020
:alt: AppVeyor build status

docs/conf.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
from textwrap import dedent
66
import os
7+
import re
78
import sys
89

910
import jsonschema
@@ -238,6 +239,15 @@
238239
# How to display URL addresses: "footnote", "no", or "inline".
239240
# texinfo_show_urls = "footnote"
240241

242+
# -- Options for the linkcheck builder ------------------------------------
243+
244+
245+
def entire_domain(host):
246+
return r"http.?://" + re.escape(host) + r"($|/.*)"
247+
248+
249+
linkcheck_ignore = [entire_domain("codecov.io")]
250+
241251
# -- Options for sphinxcontrib-spelling -----------------------------------
242252

243253
spelling_word_list_filename = "spelling-wordlist.txt"

jsonschema/tests/test_jsonschema_test_suite.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ def narrow_unicode_build(test): # pragma: no cover
6868

6969
TestDraft3 = DRAFT3.to_unittest_testcase(
7070
DRAFT3.tests(),
71-
DRAFT3.optional_tests_of(name="format"),
7271
DRAFT3.optional_tests_of(name="bignum"),
72+
DRAFT3.optional_tests_of(name="format"),
7373
DRAFT3.optional_tests_of(name="zeroTerminatedFloats"),
7474
Validator=Draft3Validator,
7575
format_checker=draft3_format_checker,
@@ -87,8 +87,8 @@ def narrow_unicode_build(test): # pragma: no cover
8787

8888
TestDraft4 = DRAFT4.to_unittest_testcase(
8989
DRAFT4.tests(),
90-
DRAFT4.optional_tests_of(name="format"),
9190
DRAFT4.optional_tests_of(name="bignum"),
91+
DRAFT4.optional_tests_of(name="format"),
9292
DRAFT4.optional_tests_of(name="zeroTerminatedFloats"),
9393
Validator=Draft4Validator,
9494
format_checker=draft4_format_checker,
@@ -135,8 +135,8 @@ def narrow_unicode_build(test): # pragma: no cover
135135

136136
TestDraft6 = DRAFT6.to_unittest_testcase(
137137
DRAFT6.tests(),
138-
DRAFT6.optional_tests_of(name="format"),
139138
DRAFT6.optional_tests_of(name="bignum"),
139+
DRAFT6.optional_tests_of(name="format"),
140140
DRAFT6.optional_tests_of(name="zeroTerminatedFloats"),
141141
Validator=Draft6Validator,
142142
format_checker=draft6_format_checker,
@@ -185,8 +185,8 @@ def narrow_unicode_build(test): # pragma: no cover
185185
DRAFT7.tests(),
186186
DRAFT7.format_tests(),
187187
DRAFT7.optional_tests_of(name="bignum"),
188-
DRAFT7.optional_tests_of(name="zeroTerminatedFloats"),
189188
DRAFT7.optional_tests_of(name="content"),
189+
DRAFT7.optional_tests_of(name="zeroTerminatedFloats"),
190190
Validator=Draft7Validator,
191191
format_checker=draft7_format_checker,
192192
skip=lambda test: (

setup.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ classifiers =
1919
Programming Language :: Python :: 3.5
2020
Programming Language :: Python :: 3.6
2121
Programming Language :: Python :: 3.7
22+
Programming Language :: Python :: 3.8
2223
Programming Language :: Python :: Implementation :: CPython
2324
Programming Language :: Python :: Implementation :: PyPy
2425

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
envlist =
3-
py{35,36,37,py,py3}-{build,tests,tests_nongpl},
3+
py{35,36,37,38,py,py3}-{build,tests,tests_nongpl},
44
demo
55
readme
66
safety

0 commit comments

Comments
 (0)