Skip to content

Commit f2b1550

Browse files
author
Bastien Vallet
committed
[compat] Drop support of PY2
Allowing to drop six requirement
1 parent dd31840 commit f2b1550

File tree

7 files changed

+2
-31
lines changed

7 files changed

+2
-31
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,6 @@ jobs:
1717
matrix:
1818
os: [macos-latest, ubuntu-latest, windows-latest]
1919
python-version:
20-
- name: pypy2
21-
toxenv: pypy2-build
22-
- name: pypy2
23-
toxenv: pypy2-tests
24-
- name: pypy2
25-
toxenv: pypy2-tests_nongpl
26-
- name: pypy2
27-
toxenv: safety
2820
- name: pypy3
2921
toxenv: pypy3-build
3022
- name: pypy3
@@ -70,16 +62,6 @@ jobs:
7062
- name: 3.8
7163
toxenv: py38-tests_nongpl
7264
exclude:
73-
# Building on Windows isn't supported, and PyPy on Windows
74-
# seems to fail with silent obscure errors.
75-
- os: windows-latest
76-
python-version:
77-
name: pypy2
78-
toxenv: pypy2-build
79-
- os: windows-latest
80-
python-version:
81-
name: pypy2
82-
toxenv: safety
8365
- os: windows-latest
8466
python-version:
8567
name: pypy3

docs/conf.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383

8484
doctest_global_setup = dedent(
8585
"""
86-
from __future__ import print_function
8786
from jsonschema import *
8887
"""
8988
)

json/bin/jsonschema_suite

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#! /usr/bin/env python3
2-
from __future__ import print_function
32
from pprint import pformat
43
import argparse
54
import errno

jsonschema/cli.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
The ``jsonschema`` command line.
33
"""
44

5-
from __future__ import absolute_import
65
from textwrap import dedent
76
import argparse
87
import errno

jsonschema/validators.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
"""
22
Creation and extension of validators, with implementations for existing drafts.
33
"""
4-
from __future__ import division
5-
64
from warnings import warn
75
import contextlib
86
import json
97
import numbers
108

11-
from six import add_metaclass
12-
139
from jsonschema import (
1410
_legacy_validators,
1511
_types,
@@ -247,8 +243,7 @@ def create(
247243
else:
248244
_created_with_default_types = None
249245

250-
@add_metaclass(_DefaultTypesDeprecatingMetaClass)
251-
class Validator(object):
246+
class Validator(metaclass=_DefaultTypesDeprecatingMetaClass):
252247

253248
VALIDATORS = dict(validators)
254249
META_SCHEMA = dict(meta_schema)

setup.cfg

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ classifiers =
1515
License :: OSI Approved :: MIT License
1616
Operating System :: OS Independent
1717
Programming Language :: Python
18-
Programming Language :: Python :: 2
19-
Programming Language :: Python :: 2.7
2018
Programming Language :: Python :: 3
2119
Programming Language :: Python :: 3.6
2220
Programming Language :: Python :: 3.7
@@ -31,7 +29,6 @@ install_requires =
3129
functools32;python_version<'3'
3230
importlib_metadata;python_version<'3.8'
3331
pyrsistent>=0.14.0
34-
six>=1.11.0
3532

3633
[options.extras_require]
3734
format =

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{36,37,38,py2,py3}-{build,tests,tests_nongpl},
3+
py{36,37,38,py3}-{build,tests,tests_nongpl},
44
demo
55
readme
66
safety

0 commit comments

Comments
 (0)