Skip to content

Commit f413136

Browse files
authored
Merge branch 'master' into numpy-tutorial
2 parents 1bcad09 + 80a721e commit f413136

File tree

15 files changed

+142
-130
lines changed

15 files changed

+142
-130
lines changed

.dependabot/config.yml

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

.github/dependabot.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: pip
4+
directory: "/"
5+
schedule:
6+
interval: monthly
7+
open-pull-requests-limit: 10
8+
allow:
9+
- dependency-name: flake8
10+
- dependency-name: black

arcade-a-primer/arcade_basic_oop.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,10 @@
1414

1515

1616
class Welcome(arcade.Window):
17-
"""Our main welcome window
18-
"""
17+
"""Our main welcome window"""
1918

2019
def __init__(self):
21-
"""Initialize the window
22-
"""
20+
"""Initialize the window"""
2321

2422
# Call the parent class constructor
2523
super().__init__(SCREEN_WIDTH, SCREEN_HEIGHT, SCREEN_TITLE)
@@ -28,8 +26,7 @@ def __init__(self):
2826
arcade.set_background_color(arcade.color.WHITE)
2927

3028
def on_draw(self):
31-
"""Called whenever we need to draw our window
32-
"""
29+
"""Called whenever we need to draw our window"""
3330

3431
# Clear the screen and start drawing
3532
arcade.start_render()

arcade-a-primer/arcade_draw_shapes.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,10 @@
1313

1414

1515
class Welcome(arcade.Window):
16-
"""Our main welcome window
17-
"""
16+
"""Our main welcome window"""
1817

1918
def __init__(self):
20-
"""Initialize the window
21-
"""
19+
"""Initialize the window"""
2220

2321
# Call the parent class constructor
2422
super().__init__(SCREEN_WIDTH, SCREEN_HEIGHT, SCREEN_TITLE)
@@ -27,8 +25,7 @@ def __init__(self):
2725
arcade.set_background_color(arcade.color.WHITE)
2826

2927
def on_draw(self):
30-
"""Called whenever we need to draw our window
31-
"""
28+
"""Called whenever we need to draw our window"""
3229

3330
# Clear the screen and start drawing
3431
arcade.start_render()

arcade-a-primer/arcade_game.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ class SpaceShooter(arcade.Window):
4141
"""
4242

4343
def __init__(self, width: int, height: int, title: str):
44-
"""Initialize the game
45-
"""
44+
"""Initialize the game"""
4645
super().__init__(width, height, title)
4746

4847
# Setup the empty sprite lists
@@ -51,8 +50,7 @@ def __init__(self, width: int, height: int, title: str):
5150
self.all_sprites = arcade.SpriteList()
5251

5352
def setup(self):
54-
"""Get the game ready to play
55-
"""
53+
"""Get the game ready to play"""
5654

5755
# Set the background color
5856
arcade.set_background_color(arcade.color.SKY_BLUE)
@@ -236,8 +234,7 @@ def on_update(self, delta_time: float):
236234
self.player.left = 0
237235

238236
def on_draw(self):
239-
"""Draw all game objects
240-
"""
237+
"""Draw all game objects"""
241238

242239
arcade.start_render()
243240
self.all_sprites.draw()

concurrency-overview/requirements.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ attrs==18.1.0
88
certifi==2018.8.13
99
chardet==3.0.4
1010
contextvars==2.3
11-
flake8==3.5.0
1211
h11==0.8.1
1312
idna==2.7
1413
immutables==0.6
@@ -23,8 +22,6 @@ pathlib2==2.3.2
2322
pluggy==0.7.1
2423
py==1.6.0
2524
pycodestyle==2.3.1
26-
pyflakes==1.6.0
27-
pylint==2.1.1
2825
pytest==3.7.3
2926
requests==2.19.1
3027
six==1.11.0

intro-to-threading/prodcom_event.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77

88

99
class Pipeline:
10-
"""Class to allow a single element pipeline between producer and consumer.
10+
"""
11+
Class to allow a single element pipeline
12+
between producer and consumer.
1113
"""
1214

1315
def __init__(self):

intro-to-threading/prodcom_lock.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99

1010
class Pipeline:
11-
"""Class to allow a single element pipeline between producer and consumer.
11+
"""
12+
Class to allow a single element pipeline
13+
between producer and consumer.
1214
"""
1315

1416
def __init__(self):

pandas-gradebook-project/02-merging-dataframes.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@
4848
# ------------------------
4949

5050
final_data = pd.merge(
51-
roster, hw_exam_grades, left_index=True, right_index=True,
51+
roster,
52+
hw_exam_grades,
53+
left_index=True,
54+
right_index=True,
5255
)
5356
final_data = pd.merge(
5457
final_data, quiz_grades, left_on="Email Address", right_index=True

pandas-gradebook-project/03-calculating-grades.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@
4949
# ------------------------
5050

5151
final_data = pd.merge(
52-
roster, hw_exam_grades, left_index=True, right_index=True,
52+
roster,
53+
hw_exam_grades,
54+
left_index=True,
55+
right_index=True,
5356
)
5457
final_data = pd.merge(
5558
final_data, quiz_grades, left_on="Email Address", right_index=True

0 commit comments

Comments
 (0)