Skip to content

Commit 264d1a4

Browse files
authored
Merge branch 'master' into patch-1
2 parents 6f769bb + 69e0878 commit 264d1a4

File tree

17 files changed

+296208
-18
lines changed

17 files changed

+296208
-18
lines changed

arcade-a-primer/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Source files supporting the **Arcade - A Modern Python Game Framework** article
1+
Source files supporting the [Arcade: A Primer on the Python Game Framework](https://realpython.com/arcade-python-game-framework/) article on [Real Python](https://realpython.com/).

arcade-a-primer/arcade_game.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class SpaceShooter(arcade.Window):
4040
Collisions end the game
4141
"""
4242

43-
def __init__(self, width, height, title):
43+
def __init__(self, width: int, height: int, title: str):
4444
"""Initialize the game
4545
"""
4646
super().__init__(width, height, title)
@@ -131,7 +131,7 @@ def add_cloud(self, delta_time: float):
131131
self.clouds_list.append(cloud)
132132
self.all_sprites.append(cloud)
133133

134-
def on_key_press(self, symbol, modifiers):
134+
def on_key_press(self, symbol: int, modifiers: int):
135135
"""Handle user keyboard input
136136
Q: Quit the game
137137
P: Pause the game

flask-connexion-rest-part-2/version_1/people.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def read_all():
2020

2121
# Serialize the data for the response
2222
person_schema = PersonSchema(many=True)
23-
data = person_schema.dump(people).data
23+
data = person_schema.dump(people)
2424
return data
2525

2626

@@ -40,7 +40,7 @@ def read_one(person_id):
4040

4141
# Serialize the data for the response
4242
person_schema = PersonSchema()
43-
data = person_schema.dump(person).data
43+
data = person_schema.dump(person)
4444
return data
4545

4646
# Otherwise, nope, didn't find that person
@@ -73,14 +73,14 @@ def create(person):
7373

7474
# Create a person instance using the schema and the passed in person
7575
schema = PersonSchema()
76-
new_person = schema.load(person, session=db.session).data
76+
new_person = schema.load(person, session=db.session)
7777

7878
# Add the person to the database
7979
db.session.add(new_person)
8080
db.session.commit()
8181

8282
# Serialize and return the newly created person in the response
83-
data = schema.dump(new_person).data
83+
data = schema.dump(new_person)
8484

8585
return data, 201
8686

@@ -142,7 +142,7 @@ def update(person_id, person):
142142

143143
# turn the passed in person into a db object
144144
schema = PersonSchema()
145-
update = schema.load(person, session=db.session).data
145+
update = schema.load(person, session=db.session)
146146

147147
# Set the id to the person we want to update
148148
update.person_id = update_person.person_id
@@ -152,7 +152,7 @@ def update(person_id, person):
152152
db.session.commit()
153153

154154
# return updated person in the response
155-
data = schema.dump(update_person).data
155+
data = schema.dump(update_person)
156156

157157
return data, 200
158158

flask-connexion-rest/version_3/swagger.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ paths:
4747
post:
4848
operationId: people.create
4949
tags:
50-
- people
50+
- People
5151
summary: Create a person and add it to the people list
5252
description: Create a new person in the people list
5353
parameters:
@@ -72,7 +72,7 @@ paths:
7272
get:
7373
operationId: people.read_one
7474
tags:
75-
- people
75+
- People
7676
summary: Read one person from the people list
7777
description: Read one person from the people list
7878
parameters:
@@ -96,7 +96,7 @@ paths:
9696
put:
9797
operationId: people.update
9898
tags:
99-
- people
99+
- People
100100
summary: Update a person in the people list
101101
description: Update a person in the people list
102102
parameters:
@@ -121,7 +121,7 @@ paths:
121121
delete:
122122
operationId: people.delete
123123
tags:
124-
- people
124+
- People
125125
summary: Delete a person from the people list
126126
description: Delete a person
127127
parameters:

introduction-combining-data-pandas-merge-join-and-concat/climate_precip.csv

Lines changed: 151111 additions & 0 deletions
Large diffs are not rendered by default.

introduction-combining-data-pandas-merge-join-and-concat/climate_temp.csv

Lines changed: 127021 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)