Skip to content

Commit 14e1e09

Browse files
committed
Merge remote-tracking branch 'origin/master' into 708-prettier-pretty
* origin/master: Remove docformatter, it's too unwieldy. Minor doc formatting. Sigh, this appears to be a regex, not exact match, so it was ignoring everything. Update pre-commit hooks. And two last ones... Remove the rest of the notebooks.ai related resources. Remove demo links from README file Move the latest validator CLI test to where it must go now. Simplify the schemas in the tests for CLI validator detection. add test case Delete the failed test case Fix the bug of processing arguments[validator] in parse_args use correct format check globally renames message and function better handling for Python 3.6 fix formatting error skip tests on python 3.6 unskip tests Temporarily skip the tests that will be unskipped by python-jsonschema#722. Squashed 'json/' changes from 86f52b87..fce9e9b3 Validate IP addresses using the ipaddress module. Skip more tests for python-jsonschema#686. Squashed 'json/' changes from ea415537..86f52b87 improve date parsing Bump the version in the notebooks.io requirements. pre-commit setup. Trailing whitespace Kill Py2 in the sphinx role. isorted. Unbreak non-format-setuptools-extra-installed jsonschema. Run CI against all setuptools extras separately. Pick a format checker that has no external dep now that fqdn exists. regenerated the requirements.txt Modify the code based on review comments fix bug about hostname by import fqdn
2 parents 6ce8ae8 + 7ce8dd3 commit 14e1e09

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+902
-340
lines changed

.github/workflows/ci.yml

Lines changed: 81 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,17 @@ jobs:
1818
os: [macos-latest, ubuntu-latest, windows-latest]
1919
python-version:
2020
- name: pypy3
21-
toxenv: pypy3-build
21+
toxenv: pypy3-noextra-build
2222
- name: pypy3
23-
toxenv: pypy3-tests
23+
toxenv: pypy3-noextra-tests
2424
- name: pypy3
25-
toxenv: pypy3-tests_nongpl
25+
toxenv: pypy3-format-build
2626
- name: pypy3
27-
toxenv: demo
27+
toxenv: pypy3-format-tests
28+
- name: pypy3
29+
toxenv: pypy3-format_nongpl-build
30+
- name: pypy3
31+
toxenv: pypy3-format_nongpl-tests
2832
- name: pypy3
2933
toxenv: readme
3034
- name: pypy3
@@ -44,36 +48,66 @@ jobs:
4448
- name: pypy3
4549
toxenv: docs-style
4650
- name: 3.6
47-
toxenv: py36-build
51+
toxenv: py36-noextra-build
52+
- name: 3.6
53+
toxenv: py36-noextra-tests
54+
- name: 3.6
55+
toxenv: py36-format-build
56+
- name: 3.6
57+
toxenv: py36-format-tests
4858
- name: 3.6
49-
toxenv: py36-tests
59+
toxenv: py36-format_nongpl-build
5060
- name: 3.6
51-
toxenv: py36-tests_nongpl
61+
toxenv: py36-format_nongpl-tests
5262
- name: 3.7
53-
toxenv: py37-build
63+
toxenv: py37-noextra-build
5464
- name: 3.7
55-
toxenv: py37-tests
65+
toxenv: py37-noextra-tests
5666
- name: 3.7
57-
toxenv: py37-tests_nongpl
67+
toxenv: py37-format-build
68+
- name: 3.7
69+
toxenv: py37-format-tests
70+
- name: 3.7
71+
toxenv: py37-format_nongpl-build
72+
- name: 3.7
73+
toxenv: py37-format_nongpl-tests
74+
- name: 3.8
75+
toxenv: py38-noextra-build
76+
- name: 3.8
77+
toxenv: py38-noextra-tests
5878
- name: 3.8
59-
toxenv: py38-build
79+
toxenv: py38-format-build
6080
- name: 3.8
61-
toxenv: py38-tests
81+
toxenv: py38-format-tests
6282
- name: 3.8
63-
toxenv: py38-tests_nongpl
83+
toxenv: py38-format_nongpl-build
84+
- name: 3.8
85+
toxenv: py38-format_nongpl-tests
6486
exclude:
6587
- os: windows-latest
6688
python-version:
6789
name: pypy3
68-
toxenv: pypy3-build
90+
toxenv: pypy3-noextra-build
91+
- os: windows-latest
92+
python-version:
93+
name: pypy3
94+
toxenv: pypy3-format-build
95+
- os: windows-latest
96+
python-version:
97+
name: pypy3
98+
toxenv: pypy3-format_nongpl-build
99+
- os: windows-latest
100+
python-version:
101+
name: pypy3
102+
toxenv: pypy3-noextra-tests
69103
- os: windows-latest
70104
python-version:
71105
name: pypy3
72-
toxenv: pypy3-tests
106+
toxenv: pypy3-format-tests
73107
- os: windows-latest
74108
python-version:
75109
name: pypy3
76-
toxenv: pypy3-tests_nongpl
110+
toxenv: pypy3-format_nongpl-tests
77111
- os: windows-latest
78112
python-version:
79113
name: pypy3
@@ -89,27 +123,51 @@ jobs:
89123
- os: windows-latest
90124
python-version:
91125
name: 3.6
92-
toxenv: py36-tests
126+
toxenv: py36-noextra-build
93127
- os: windows-latest
94128
python-version:
95129
name: 3.6
96-
toxenv: py36-tests_nongpl
130+
toxenv: py36-format-build
97131
- os: windows-latest
98132
python-version:
99133
name: 3.6
100-
toxenv: py36-build
134+
toxenv: py36-format_nongpl-build
135+
- os: windows-latest
136+
python-version:
137+
name: 3.6
138+
toxenv: py36-noextra-tests
139+
- os: windows-latest
140+
python-version:
141+
name: 3.6
142+
toxenv: py36-format-tests
143+
- os: windows-latest
144+
python-version:
145+
name: 3.6
146+
toxenv: py36-format_nongpl-tests
147+
- os: windows-latest
148+
python-version:
149+
name: 3.7
150+
toxenv: py37-noextra-tests
151+
- os: windows-latest
152+
python-version:
153+
name: 3.7
154+
toxenv: py37-format-tests
101155
- os: windows-latest
102156
python-version:
103157
name: 3.7
104-
toxenv: py37-build
158+
toxenv: py37-format_nongpl-tests
105159
- os: windows-latest
106160
python-version:
107161
name: 3.8
108-
toxenv: py38-build
162+
toxenv: py38-noextra-tests
109163
- os: windows-latest
110164
python-version:
111-
name: pypy3
112-
toxenv: demo
165+
name: 3.8
166+
toxenv: py38-format-tests
167+
- os: windows-latest
168+
python-version:
169+
name: 3.8
170+
toxenv: py38-format_nongpl-tests
113171
- os: windows-latest
114172
python-version:
115173
name: pypy3

.pre-commit-config.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
exclude: json/
2+
3+
repos:
4+
- repo: https://github.com/pre-commit/pre-commit-hooks
5+
rev: v3.2.0
6+
hooks:
7+
- id: check-ast
8+
- id: check-docstring-first
9+
- id: check-json
10+
- id: check-toml
11+
- id: check-vcs-permalinks
12+
- id: check-yaml
13+
- id: debug-statements
14+
- id: end-of-file-fixer
15+
- id: trailing-whitespace
16+
- repo: https://github.com/timothycrosley/isort
17+
rev: 5.4.2
18+
hooks:
19+
- id: isort

CHANGELOG.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ v2.6.0
4343
* Support for Python 2.6 has been dropped.
4444
* Improve a few error messages for ``uniqueItems`` (#224) and
4545
``additionalProperties`` (#317)
46-
* Fixed an issue with ``ErrorTree``'s handling of multiple errors (#288)
46+
* Fixed an issue with ``ErrorTree``'s handling of multiple errors (#288)
4747

4848
v2.5.0
4949
------
@@ -175,7 +175,7 @@ v0.4
175175
In order to make this happen (and also to clean things up a bit), a number
176176
of deprecations are necessary:
177177

178-
* ``stop_on_error`` is deprecated in ``Validator.__init__``. Use
178+
* ``stop_on_error`` is deprecated in ``Validator.__init__``. Use
179179
``Validator.iter_errors()`` instead.
180180
* ``number_types`` and ``string_types`` are deprecated there as well.
181181
Use ``types={"number" : ..., "string" : ...}`` instead.

DEMO.ipynb

Lines changed: 0 additions & 167 deletions
This file was deleted.

README.rst

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -80,24 +80,6 @@ Installation
8080
$ pip install jsonschema
8181
8282
83-
Demo
84-
----
85-
86-
Try ``jsonschema`` interactively in this online demo:
87-
88-
.. image:: https://user-images.githubusercontent.com/1155573/56745335-8b158a00-6750-11e9-8776-83fa675939c4.png
89-
:target: https://notebooks.ai/demo/gh/Julian/jsonschema
90-
:alt: Open Live Demo
91-
92-
93-
Online demo Notebook will look similar to this:
94-
95-
96-
.. image:: https://user-images.githubusercontent.com/1155573/56820861-5c1c1880-6823-11e9-802a-ce01c5ec574f.gif
97-
:alt: Open Live Demo
98-
:width: 480 px
99-
100-
10183
Release Notes
10284
-------------
10385

@@ -125,7 +107,7 @@ Benchmarks
125107
----------
126108

127109
``jsonschema``'s benchmarks make use of `pyperf
128-
<https://pyperf.readthedocs.io>`_. Running them can be done via::
110+
<https://pyperf.readthedocs.io>`_. Running them can be done via::
129111

130112
$ tox -e perf
131113

0 commit comments

Comments
 (0)