Skip to content

Commit 00b0c17

Browse files
committed
Drop py2 support
1 parent a78cb57 commit 00b0c17

File tree

6 files changed

+21
-30
lines changed

6 files changed

+21
-30
lines changed

Diff for: js/scripts/templates/py_wrapper.mustache

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import six
21
from ipywidgets import (
32
Widget, DOMWidget, widget_serialization, register
43
)
@@ -57,7 +56,6 @@ class {{ className }}({{ superClass.className }}):
5756

5857
{{/each}}
5958

60-
if six.PY3:
61-
import inspect
62-
# Include explicit signature since the metaclass screws it up
63-
{{ className }}.__signature__ = inspect.signature({{ className }}.__init__)
59+
import inspect
60+
# Include explicit signature since the metaclass screws it up
61+
{{ className }}.__signature__ = inspect.signature({{ className }}.__init__)

Diff for: pythreejs/_base/uniforms.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11

2-
from six import string_types
3-
42
from ipywidgets import Widget, widget_serialization
53

64
def serialize_uniforms(uniforms, obj):
@@ -19,7 +17,7 @@ def serialize_uniforms(uniforms, obj):
1917
'value': widget_serialization['to_json'](value, None)
2018
}
2119

22-
elif isinstance(value, string_types):
20+
elif isinstance(value, str):
2321
serialized[name] = {
2422
'type': 'c',
2523
'value': value

Diff for: pythreejs/core/Renderer.py

+13-15
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
"""
22
"""
33

4-
import six
54
from contextlib import contextmanager
65
from ipywidgets import widget_serialization
76
from traitlets import (
@@ -69,17 +68,16 @@ def hold(self):
6968
self._pause_autorender = False
7069

7170

72-
if six.PY3:
73-
from inspect import Signature, Parameter
74-
# Include explicit signature since the metaclass screws it up
75-
parameters = [
76-
Parameter('scene', Parameter.POSITIONAL_OR_KEYWORD),
77-
Parameter('camera', Parameter.POSITIONAL_OR_KEYWORD),
78-
Parameter('controls', Parameter.POSITIONAL_OR_KEYWORD, default=None),
79-
]
80-
for name in ('width', 'height', 'background', 'background_opacity'):
81-
parameters.append(Parameter(
82-
name, Parameter.KEYWORD_ONLY, default=getattr(Renderer, name).default_value))
83-
parameters.append(Parameter('kwargs', Parameter.VAR_KEYWORD))
84-
Renderer.__signature__ = Signature(parameters=tuple(parameters))
85-
del parameters
71+
from inspect import Signature, Parameter
72+
# Include explicit signature since the metaclass screws it up
73+
parameters = [
74+
Parameter('scene', Parameter.POSITIONAL_OR_KEYWORD),
75+
Parameter('camera', Parameter.POSITIONAL_OR_KEYWORD),
76+
Parameter('controls', Parameter.POSITIONAL_OR_KEYWORD, default=None),
77+
]
78+
for name in ('width', 'height', 'background', 'background_opacity'):
79+
parameters.append(Parameter(
80+
name, Parameter.KEYWORD_ONLY, default=getattr(Renderer, name).default_value))
81+
parameters.append(Parameter('kwargs', Parameter.VAR_KEYWORD))
82+
Renderer.__signature__ = Signature(parameters=tuple(parameters))
83+
del parameters

Diff for: pythreejs/traits.py

+2-6
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
# -*- coding: utf-8 -*-
33

44
from collections import namedtuple
5-
try:
6-
from collections.abc import Sequence # python3
7-
except ImportError:
8-
from collections import Sequence # python2
9-
import six
5+
from collections.abc import Sequence
106
import re
117
import warnings
128

@@ -254,7 +250,7 @@ class Color(Unicode):
254250
def validate(self, obj, value):
255251
if value is None and self.allow_none:
256252
return value
257-
if isinstance(value, six.string_types):
253+
if isinstance(value, str):
258254
if value.lower() in _color_names or _color_re.match(value):
259255
return value
260256
elif _color_hexa_re.match(value) or _color_rgbhsl_re.match(value):

Diff for: setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bdist_wheel]
2-
universal=1
2+
universal=0
33

44
[metadata]
55
license_file = LICENSE

Diff for: setup.py

+1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
'long_description_content_type': 'text/markdown',
6363
'license': 'BSD-3-Clause',
6464
'include_package_data': True,
65+
'python_requires': '>=3.7',
6566
'install_requires': [
6667
'ipywidgets>=7.2.1',
6768
'ipydatawidgets>=1.1.1',

0 commit comments

Comments
 (0)