Skip to content

Commit b8b8010

Browse files
paprpapr
authored
Merge pull request #2110 from pupil-labs/black-check
Add GH Action to check black formatting
2 parents 7eb0673 + 6d7ea43 commit b8b8010

File tree

14 files changed

+382
-230
lines changed

14 files changed

+382
-230
lines changed

‎.github/workflows/black-check.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# This is a basic workflow to help you get started with Actions
2+
3+
name: Black Check
4+
5+
# Controls when the action will run. Triggers the workflow on push or pull request
6+
# events but only for the master branch
7+
on:
8+
push:
9+
branches: [ master ]
10+
pull_request:
11+
branches: [ master, develop ]
12+
13+
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
14+
jobs:
15+
# This workflow contains a single job called "build"
16+
build:
17+
# The type of runner that the job will run on
18+
runs-on: ubuntu-latest
19+
20+
# Steps represent a sequence of tasks that will be executed as part of the job
21+
steps:
22+
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
23+
- uses: actions/checkout@v2
24+
- name: Black Check
25+
# You may pin to the exact commit or the version.
26+
uses: jpetrucciani/[email protected]

‎conftest.py‎

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

‎deployment/find_opengl_bigsur.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@
1515
print("Attempting to import OpenGL using patched `ctypes.util.find_library`...")
1616
_find_library_original = ctypes.util.find_library
1717

18+
1819
@functools.wraps(_find_library_original)
1920
def _find_library_patched(name):
2021
if name == "OpenGL":
2122
return "/System/Library/Frameworks/OpenGL.framework/OpenGL"
2223
else:
2324
return _find_library_original(name)
2425

26+
2527
ctypes.util.find_library = _find_library_patched
2628

2729
import OpenGL.GL

‎pupil_src/launchables/world.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -703,7 +703,9 @@ def window_should_update():
703703
return next(window_update_timer)
704704

705705
# trigger setup of window and gl sizes
706-
g_pool.trigger_main_window_redraw = lambda: on_resize(main_window, *glfw.get_framebuffer_size(main_window))
706+
g_pool.trigger_main_window_redraw = lambda: on_resize(
707+
main_window, *glfw.get_framebuffer_size(main_window)
708+
)
707709
g_pool.trigger_main_window_redraw()
708710

709711
if session_settings.get("eye1_process_alive", True):

‎pupil_src/tests/gaze_mapping/test_notifications.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ def test_success_notification_serialization():
3636

3737
_test_notification_serialization(
3838
cls=cls,
39-
valid_samples=[serialized_sample_1, serialized_sample_2,],
39+
valid_samples=[
40+
serialized_sample_1,
41+
serialized_sample_2,
42+
],
4043
invalid_samples=[
4144
{
4245
"subject": "calibration.successful.xyz",

‎pupil_src/tests/surface_tracker/fixtures/__init__.py‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,23 +40,43 @@
4040
surface_marker_aggregates_deserialized as surface_marker_aggregates_deserialized_v01_square,
4141
)
4242

43+
4344
def surface_pairs_v01_mixed() -> typing.Collection[typing.Tuple[Surface, dict]]:
4445
return (*surface_pairs_v01_apriltag(), *surface_pairs_v01_square())
4546

47+
4648
def surfaces_serialized_v01_mixed() -> typing.Collection[dict]:
4749
return (*surfaces_serialized_v01_apriltag(), *surfaces_serialized_v01_square())
4850

51+
4952
def surfaces_deserialized_v01_mixed() -> typing.Collection[Surface]:
5053
return (*surfaces_deserialized_v01_apriltag(), *surfaces_deserialized_v01_square())
5154

52-
def surface_marker_aggregate_pairs_v01_mixed() -> typing.Collection[typing.Tuple[Surface_Marker_Aggregate, dict]]:
53-
return (*surface_marker_aggregate_pairs_v01_apriltag(), *surface_marker_aggregate_pairs_v01_square())
55+
56+
def surface_marker_aggregate_pairs_v01_mixed() -> typing.Collection[
57+
typing.Tuple[Surface_Marker_Aggregate, dict]
58+
]:
59+
return (
60+
*surface_marker_aggregate_pairs_v01_apriltag(),
61+
*surface_marker_aggregate_pairs_v01_square(),
62+
)
63+
5464

5565
def surface_marker_aggregates_serialized_v01_mixed() -> typing.Collection[dict]:
56-
return (*surface_marker_aggregates_serialized_v01_apriltag(), *surface_marker_aggregates_serialized_v01_square())
66+
return (
67+
*surface_marker_aggregates_serialized_v01_apriltag(),
68+
*surface_marker_aggregates_serialized_v01_square(),
69+
)
70+
71+
72+
def surface_marker_aggregates_deserialized_v01_mixed() -> typing.Collection[
73+
Surface_Marker_Aggregate
74+
]:
75+
return (
76+
*surface_marker_aggregates_deserialized_v01_apriltag(),
77+
*surface_marker_aggregates_deserialized_v01_square(),
78+
)
5779

58-
def surface_marker_aggregates_deserialized_v01_mixed() -> typing.Collection[Surface_Marker_Aggregate]:
59-
return (*surface_marker_aggregates_deserialized_v01_apriltag(), *surface_marker_aggregates_deserialized_v01_square())
6080

6181
from .fixtures_surface_definition_files import (
6282
surface_definition_v00_dir,

‎pupil_src/tests/surface_tracker/fixtures/fixtures_surface_definition_files.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ def surface_definition_v01_after_update_dir() -> str:
5959
##### PRIVATE
6060

6161

62-
def _create_dir_with_surface_definition_file(file_name: str, serialized_surfaces: typing.Collection[dict]) -> str:
62+
def _create_dir_with_surface_definition_file(
63+
file_name: str, serialized_surfaces: typing.Collection[dict]
64+
) -> str:
6365
root_dir = os.path.join(tempfile.gettempdir(), str(uuid.uuid4()))
6466
file_path = os.path.join(root_dir, file_name)
6567

‎pupil_src/tests/surface_tracker/fixtures/fixtures_surface_v00_square.py‎

Lines changed: 99 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@
1515
from surface_tracker.surface import Surface
1616
from surface_tracker.surface_online import Surface_Online
1717
from surface_tracker.surface_offline import Surface_Offline
18-
from surface_tracker.surface_marker_aggregate import Surface_Marker_Aggregate, Surface_Marker_UID
18+
from surface_tracker.surface_marker_aggregate import (
19+
Surface_Marker_Aggregate,
20+
Surface_Marker_UID,
21+
)
1922

2023

2124
__all__ = [
@@ -29,125 +32,151 @@
2932

3033

3134
def surface_pairs() -> typing.Collection[typing.Tuple[Surface, dict]]:
32-
return (
33-
(SURFACE_V00_DESERIALIZED, SURFACE_V00_SERIALIZED),
34-
)
35+
return ((SURFACE_V00_DESERIALIZED, SURFACE_V00_SERIALIZED),)
36+
3537

3638
def surfaces_serialized() -> typing.Collection[dict]:
3739
return tuple(s for d, s in surface_pairs())
3840

41+
3942
def surfaces_deserialized() -> typing.Collection[Surface]:
4043
return tuple(d for d, s in surface_pairs())
4144

42-
def surface_marker_aggregate_pairs() -> typing.Collection[typing.Tuple[Surface_Marker_Aggregate, dict]]:
45+
46+
def surface_marker_aggregate_pairs() -> typing.Collection[
47+
typing.Tuple[Surface_Marker_Aggregate, dict]
48+
]:
4349
return (
44-
(SURFACE_MARKER_AGGREGATE_V00_DESERIALIZED_0_DIST, SURFACE_MARKER_AGGREGATE_V00_SERIALIZED_0_DIST),
45-
(SURFACE_MARKER_AGGREGATE_V00_DESERIALIZED_1_DIST, SURFACE_MARKER_AGGREGATE_V00_SERIALIZED_1_DIST),
46-
(SURFACE_MARKER_AGGREGATE_V00_DESERIALIZED_0_UNDIST, SURFACE_MARKER_AGGREGATE_V00_SERIALIZED_0_UNDIST),
47-
(SURFACE_MARKER_AGGREGATE_V00_DESERIALIZED_1_UNDIST, SURFACE_MARKER_AGGREGATE_V00_SERIALIZED_1_UNDIST),
50+
(
51+
SURFACE_MARKER_AGGREGATE_V00_DESERIALIZED_0_DIST,
52+
SURFACE_MARKER_AGGREGATE_V00_SERIALIZED_0_DIST,
53+
),
54+
(
55+
SURFACE_MARKER_AGGREGATE_V00_DESERIALIZED_1_DIST,
56+
SURFACE_MARKER_AGGREGATE_V00_SERIALIZED_1_DIST,
57+
),
58+
(
59+
SURFACE_MARKER_AGGREGATE_V00_DESERIALIZED_0_UNDIST,
60+
SURFACE_MARKER_AGGREGATE_V00_SERIALIZED_0_UNDIST,
61+
),
62+
(
63+
SURFACE_MARKER_AGGREGATE_V00_DESERIALIZED_1_UNDIST,
64+
SURFACE_MARKER_AGGREGATE_V00_SERIALIZED_1_UNDIST,
65+
),
4866
)
4967

68+
5069
def surface_marker_aggregates_serialized() -> typing.Collection[dict]:
5170
return tuple(s for d, s in surface_marker_aggregate_pairs())
5271

53-
def surface_marker_aggregates_deserialized() -> typing.Collection[Surface_Marker_Aggregate]:
54-
return tuple(d for d, s in surface_marker_aggregate_pairs())
5572

73+
def surface_marker_aggregates_deserialized() -> typing.Collection[
74+
Surface_Marker_Aggregate
75+
]:
76+
return tuple(d for d, s in surface_marker_aggregate_pairs())
5677

5778

5879
##### PRIVATE
5980

6081

6182
SURFACE_MARKER_AGGREGATE_V00_SERIALIZED_0_UNDIST = {
62-
'id': 7,
63-
'verts_uv': [
64-
[2.0279725503600556e-14, -2.0718593602363743e-14],
65-
[0.09232430905103683, 0.0054827057756483555],
66-
[0.09320462495088577, 0.07479614019393921],
67-
[0.008808332495391369, 0.07134716212749481]
68-
]
83+
"id": 7,
84+
"verts_uv": [
85+
[2.0279725503600556e-14, -2.0718593602363743e-14],
86+
[0.09232430905103683, 0.0054827057756483555],
87+
[0.09320462495088577, 0.07479614019393921],
88+
[0.008808332495391369, 0.07134716212749481],
89+
],
6990
}
7091
SURFACE_MARKER_AGGREGATE_V00_SERIALIZED_1_UNDIST = {
71-
'id': 57,
72-
'verts_uv': [
73-
[0.9255635738372803, 0.9278208017349243],
74-
[0.9941799640655518, 0.928483784198761],
75-
[0.9941900372505188, 0.9999602437019348],
76-
[0.9251440763473511, 0.998592734336853]
77-
]
92+
"id": 57,
93+
"verts_uv": [
94+
[0.9255635738372803, 0.9278208017349243],
95+
[0.9941799640655518, 0.928483784198761],
96+
[0.9941900372505188, 0.9999602437019348],
97+
[0.9251440763473511, 0.998592734336853],
98+
],
7899
}
79100
SURFACE_MARKER_AGGREGATE_V00_SERIALIZED_0_DIST = {
80-
'id': 7,
81-
'verts_uv': [
82-
[1.9851928125457982e-14, -1.923472062778219e-14],
83-
[0.060702838003635406, -0.004638743586838245],
84-
[0.05217646434903145, 0.06511983275413513],
85-
[-0.009258653968572617, 0.06691507995128632]
86-
]
101+
"id": 7,
102+
"verts_uv": [
103+
[1.9851928125457982e-14, -1.923472062778219e-14],
104+
[0.060702838003635406, -0.004638743586838245],
105+
[0.05217646434903145, 0.06511983275413513],
106+
[-0.009258653968572617, 0.06691507995128632],
107+
],
87108
}
88109
SURFACE_MARKER_AGGREGATE_V00_SERIALIZED_1_DIST = {
89-
'id': 57,
90-
'verts_uv': [
91-
[0.9114755799300843, 0.9409661768393776],
92-
[0.9818958957355025, 0.9379570537747127],
93-
[0.9800677671918846, 1.005555440640987],
94-
[0.909855488690773, 1.0082552654603305]
95-
]
110+
"id": 57,
111+
"verts_uv": [
112+
[0.9114755799300843, 0.9409661768393776],
113+
[0.9818958957355025, 0.9379570537747127],
114+
[0.9800677671918846, 1.005555440640987],
115+
[0.909855488690773, 1.0082552654603305],
116+
],
96117
}
97118
SURFACE_V00_SERIALIZED = {
98-
'name': 'surface_v00',
99-
'real_world_size': {'x': 1.0, 'y': 1.0},
100-
'reg_markers': [
119+
"name": "surface_v00",
120+
"real_world_size": {"x": 1.0, "y": 1.0},
121+
"reg_markers": [
101122
SURFACE_MARKER_AGGREGATE_V00_SERIALIZED_0_UNDIST,
102123
SURFACE_MARKER_AGGREGATE_V00_SERIALIZED_1_UNDIST,
103124
],
104-
'registered_markers_dist': [
125+
"registered_markers_dist": [
105126
SURFACE_MARKER_AGGREGATE_V00_SERIALIZED_0_DIST,
106127
SURFACE_MARKER_AGGREGATE_V00_SERIALIZED_1_DIST,
107128
],
108-
'build_up_status': 1.0,
109-
'deprecated': False
129+
"build_up_status": 1.0,
130+
"deprecated": False,
110131
}
111132

112133
SURFACE_MARKER_AGGREGATE_V00_DESERIALIZED_0_UNDIST = Surface_Marker_Aggregate(
113134
uid=Surface_Marker_UID("legacy:7"),
114-
verts_uv=np.asarray([
115-
[2.0279725503600556e-14, -2.0718593602363743e-14],
116-
[0.09232430905103683, 0.0054827057756483555],
117-
[0.09320462495088577, 0.07479614019393921],
118-
[0.008808332495391369, 0.07134716212749481]
119-
])
135+
verts_uv=np.asarray(
136+
[
137+
[2.0279725503600556e-14, -2.0718593602363743e-14],
138+
[0.09232430905103683, 0.0054827057756483555],
139+
[0.09320462495088577, 0.07479614019393921],
140+
[0.008808332495391369, 0.07134716212749481],
141+
]
142+
),
120143
)
121144
SURFACE_MARKER_AGGREGATE_V00_DESERIALIZED_1_UNDIST = Surface_Marker_Aggregate(
122145
uid=Surface_Marker_UID("legacy:57"),
123-
verts_uv=np.asarray([
124-
[0.9255635738372803, 0.9278208017349243],
125-
[0.9941799640655518, 0.928483784198761],
126-
[0.9941900372505188, 0.9999602437019348],
127-
[0.9251440763473511, 0.998592734336853]
128-
])
146+
verts_uv=np.asarray(
147+
[
148+
[0.9255635738372803, 0.9278208017349243],
149+
[0.9941799640655518, 0.928483784198761],
150+
[0.9941900372505188, 0.9999602437019348],
151+
[0.9251440763473511, 0.998592734336853],
152+
]
153+
),
129154
)
130155
SURFACE_MARKER_AGGREGATE_V00_DESERIALIZED_0_DIST = Surface_Marker_Aggregate(
131156
uid=Surface_Marker_UID("legacy:7"),
132-
verts_uv=np.asarray([
133-
[1.9851928125457982e-14, -1.923472062778219e-14],
134-
[0.060702838003635406, -0.004638743586838245],
135-
[0.05217646434903145, 0.06511983275413513],
136-
[-0.009258653968572617, 0.06691507995128632]
137-
])
157+
verts_uv=np.asarray(
158+
[
159+
[1.9851928125457982e-14, -1.923472062778219e-14],
160+
[0.060702838003635406, -0.004638743586838245],
161+
[0.05217646434903145, 0.06511983275413513],
162+
[-0.009258653968572617, 0.06691507995128632],
163+
]
164+
),
138165
)
139166
SURFACE_MARKER_AGGREGATE_V00_DESERIALIZED_1_DIST = Surface_Marker_Aggregate(
140167
uid=Surface_Marker_UID("legacy:57"),
141-
verts_uv=np.asarray([
142-
[0.9114755799300843, 0.9409661768393776],
143-
[0.9818958957355025, 0.9379570537747127],
144-
[0.9800677671918846, 1.005555440640987],
145-
[0.909855488690773, 1.0082552654603305]
146-
])
168+
verts_uv=np.asarray(
169+
[
170+
[0.9114755799300843, 0.9409661768393776],
171+
[0.9818958957355025, 0.9379570537747127],
172+
[0.9800677671918846, 1.005555440640987],
173+
[0.909855488690773, 1.0082552654603305],
174+
]
175+
),
147176
)
148177
SURFACE_V00_DESERIALIZED = Surface_Offline(
149178
name="surface_v00",
150-
real_world_size={'x': 1.0, 'y': 1.0},
179+
real_world_size={"x": 1.0, "y": 1.0},
151180
marker_aggregates_undist=[
152181
SURFACE_MARKER_AGGREGATE_V00_DESERIALIZED_0_UNDIST,
153182
SURFACE_MARKER_AGGREGATE_V00_DESERIALIZED_1_UNDIST,

0 commit comments

Comments
 (0)