Skip to content

Commit 52e1c1d

Browse files
authored
Merge branch 'master' into remove-extra-colon
2 parents 42310c5 + 80a721e commit 52e1c1d

39 files changed

+548
-131
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

django-view-auth/.gitignore

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# git ls-files --others --exclude-from=.git/info/exclude
2+
# Lines that start with '#' are comments.
3+
# For a project mostly in C, the following would be a good set of
4+
# exclude patterns (uncomment them if you want to use them):
5+
# *.[oa]
6+
# *~
7+
.DS_Store
8+
*.pyc
9+
*.o
10+
*.so
11+
*.swp
12+
*~
13+
.coverage*
14+
htmlcov/
15+
foo.py
16+
debug.log
17+
db.sqlite3
18+
logs/*
19+
*.egg
20+
*.eggs
21+
*.egg-info
22+
build/
23+
dist/
24+
docs/_build/
25+
extras/sample_site/uploads/
26+
extras/sample_site/db.sqlite3
27+
.tox/

django-view-auth/Blog/Blog/__init__.py

Whitespace-only changes.

django-view-auth/Blog/Blog/asgi.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
"""
2+
ASGI config for Blog project.
3+
4+
It exposes the ASGI callable as a module-level variable named ``application``.
5+
6+
For more information on this file, see
7+
https://docs.djangoproject.com/en/3.0/howto/deployment/asgi/
8+
"""
9+
10+
import os
11+
12+
from django.core.asgi import get_asgi_application
13+
14+
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "Blog.settings")
15+
16+
application = get_asgi_application()
Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
"""
2+
Django settings for Blog project.
3+
4+
Generated by 'django-admin startproject' using Django 3.0.7.
5+
6+
For more information on this file, see
7+
https://docs.djangoproject.com/en/3.0/topics/settings/
8+
9+
For the full list of settings and their values, see
10+
https://docs.djangoproject.com/en/3.0/ref/settings/
11+
"""
12+
13+
import os
14+
15+
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
16+
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
17+
18+
19+
# Quick-start development settings - unsuitable for production
20+
# See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/
21+
22+
# SECURITY WARNING: keep the secret key used in production secret!
23+
SECRET_KEY = "9p2cpl%!f8a0tptz_85&dulu&!_ve=j_0s6-l4=tc-g!p-$whj"
24+
25+
# SECURITY WARNING: don't run with debug turned on in production!
26+
DEBUG = True
27+
28+
ALLOWED_HOSTS = []
29+
30+
31+
# Application definition
32+
33+
INSTALLED_APPS = [
34+
"django.contrib.admin",
35+
"django.contrib.auth",
36+
"django.contrib.contenttypes",
37+
"django.contrib.sessions",
38+
"django.contrib.messages",
39+
"django.contrib.staticfiles",
40+
"core",
41+
]
42+
43+
MIDDLEWARE = [
44+
"django.middleware.security.SecurityMiddleware",
45+
"django.contrib.sessions.middleware.SessionMiddleware",
46+
"django.middleware.common.CommonMiddleware",
47+
"django.middleware.csrf.CsrfViewMiddleware",
48+
"django.contrib.auth.middleware.AuthenticationMiddleware",
49+
"django.contrib.messages.middleware.MessageMiddleware",
50+
"django.middleware.clickjacking.XFrameOptionsMiddleware",
51+
]
52+
53+
ROOT_URLCONF = "Blog.urls"
54+
55+
TEMPLATES = [
56+
{
57+
"BACKEND": "django.template.backends.django.DjangoTemplates",
58+
"DIRS": [os.path.join(BASE_DIR, "templates")],
59+
"APP_DIRS": True,
60+
"OPTIONS": {
61+
"context_processors": [
62+
"django.template.context_processors.debug",
63+
"django.template.context_processors.request",
64+
"django.contrib.auth.context_processors.auth",
65+
"django.contrib.messages.context_processors.messages",
66+
],
67+
},
68+
},
69+
]
70+
71+
WSGI_APPLICATION = "Blog.wsgi.application"
72+
73+
74+
# Database
75+
# https://docs.djangoproject.com/en/3.0/ref/settings/#databases
76+
77+
DATABASES = {
78+
"default": {
79+
"ENGINE": "django.db.backends.sqlite3",
80+
"NAME": os.path.join(BASE_DIR, "db.sqlite3"),
81+
}
82+
}
83+
84+
85+
# Password validation
86+
# https://docs.djangoproject.com/en/3.0/ref/settings/#auth-password-validators
87+
88+
AUTH_PASSWORD_VALIDATORS = []
89+
90+
91+
# Internationalization
92+
# https://docs.djangoproject.com/en/3.0/topics/i18n/
93+
94+
LANGUAGE_CODE = "en-us"
95+
96+
TIME_ZONE = "UTC"
97+
98+
USE_I18N = True
99+
100+
USE_L10N = True
101+
102+
USE_TZ = True
103+
104+
105+
# Static files (CSS, JavaScript, Images)
106+
# https://docs.djangoproject.com/en/3.0/howto/static-files/
107+
108+
STATIC_URL = "/static/"

0 commit comments

Comments
 (0)