Skip to content

Commit 57a36d7

Browse files
authored
Merge pull request #743 from python-discord/cj9-changes
Make finalizing codejam 9 changes
2 parents 7511c6d + 5ad1c2f commit 57a36d7

File tree

6 files changed

+35
-33
lines changed

6 files changed

+35
-33
lines changed

pydis_site/templates/events/index.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
{% block event_content %}
1010
<div class="box">
1111
<h2 class="title is-4"><a href="{% url "events:page" path="code-jams" %}">Code Jams</a></h2>
12-
<div class="notification is-success">
13-
The <b>2022 Summer Code Jam</b> is currently underway and you can still enter! <b>The qualifier is open until July 13</b>; check out the details <a href="{% url "events:page" path="code-jams/9" %}">here</a>.
14-
</div>
1512
<p>Every year we hold a community-wide Summer Code Jam. For this event, members of our community are assigned to teams to collaborate and create something amazing using a technology we picked for them. One such technology that was picked for the Summer 2021 Code Jam was text user interfaces (TUIs), where teams could pick from a pre-approved list of frameworks.</p>
1613
<p>To help fuel the creative process, we provide a specific theme, like <strong>Think Inside the Box</strong> or <strong>Early Internet</strong>. At the end of the Code Jam, the projects are judged by Python Discord server staff members and guest judges from the larger Python community. The judges will consider creativity, code quality, teamwork, and adherence to the theme.</p>
1714
<p>If you want to read more about Code Jams, visit our <a href="{% url "events:page" path="code-jams" %}">Code Jam info page</a> or watch this video showcasing the best projects created during the <strong>Winter Code Jam 2020: Ancient Technology</strong>:</p>

pydis_site/templates/events/pages/code-jams/9/_index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ <h3 id="important-dates"><a href="#important-dates">Important Dates</a></h3>
2424
<ul>
2525
<li><strike>Saturday, June 18 - Form to submit theme suggestions opens</strike></li>
2626
<li><strike>Wednesday, June 29 - The Qualifier is released</strike></li>
27-
<li>Wednesday, July 6 - Voting for the theme opens</li>
28-
<li>Wednesday, July 13 - The Qualifier closes</li>
27+
<li><strike>Wednesday, July 6 - Voting for the theme opens</strike></li>
28+
<li><strike>Wednesday, July 13 - The Qualifier closes</strike></li>
2929
<li>Thursday, July 21 - Code Jam Begins</li>
3030
<li>Sunday, July 31 - Coding portion of the jam ends</li>
3131
<li>Sunday, August 4 - Code Jam submissions are closed</li>

pydis_site/templates/events/pages/code-jams/9/frameworks.html

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -71,70 +71,70 @@ <h3 id="approved-frameworks"><a href="#approved-frameworks">Approved Frameworks<
7171
<div class="card mb-4">
7272
<div class="card-content">
7373
<div class="content">
74-
<p class="subtitle">Django Channels</p>
75-
<p>Django Channels adds WebSocket-support to Django - built on ASGI like other web frameworks.
74+
<p class="subtitle">aiohttp</p>
75+
<p>aiohttp provides both a client and server WebSocket implementation, while avoiding callback-hell.
7676
</p>
7777
</div>
7878
</div>
7979
<div class="card-footer">
80-
<a href="https://channels.readthedocs.io/en/stable" class="card-footer-item"><i class="fas fa-book"></i>&ensp;Documentation</a>
81-
<a href="https://github.com/django/channels" class="card-footer-item"><i class="fab fa-github"></i>&ensp;GitHub</a>
80+
<a href="https://docs.aiohttp.org/en/stable/client_quickstart.html#websockets" class="card-footer-item"><i class="fas fa-book"></i>&ensp;Documentation</a>
81+
<a href="https://github.com/aio-libs/aiohttp" class="card-footer-item"><i class="fab fa-github"></i>&ensp;GitHub</a>
8282
</div>
8383
</div>
8484

8585
<div class="card mb-4">
8686
<div class="card-content">
8787
<div class="content">
88-
<p class="subtitle">Flask-SocketIO</p>
89-
<p>Flask-SocketIO gives Flask applications access to low latency bi-directional communications between the clients and the server.
88+
<p class="subtitle">Django Channels</p>
89+
<p>Django Channels adds WebSocket-support to Django - built on ASGI like other web frameworks.
9090
</p>
9191
</div>
9292
</div>
9393
<div class="card-footer">
94-
<a href="https://flask-socketio.readthedocs.io/en/latest" class="card-footer-item"><i class="fas fa-book"></i>&ensp;Documentation</a>
95-
<a href="https://github.com/miguelgrinberg/flask-socketio" class="card-footer-item"><i class="fab fa-github"></i>&ensp;GitHub</a>
94+
<a href="https://channels.readthedocs.io/en/stable" class="card-footer-item"><i class="fas fa-book"></i>&ensp;Documentation</a>
95+
<a href="https://github.com/django/channels" class="card-footer-item"><i class="fab fa-github"></i>&ensp;GitHub</a>
9696
</div>
9797
</div>
9898

9999
<div class="card mb-4">
100100
<div class="card-content">
101101
<div class="content">
102-
<p class="subtitle">wsproto</p>
103-
<p>wsproto is a pure-Python WebSocket protocol stack written to be as flexible as possible by having the user build the bridge to the I/O.
102+
<p class="subtitle">Starlite</p>
103+
<p>Starlite is a light and flexible ASGI API framework, using Starlette and Pydantic as foundations.
104104
</p>
105105
</div>
106106
</div>
107107
<div class="card-footer">
108-
<a href="https://python-hyper.org/projects/wsproto/en/stable" class="card-footer-item"><i class="fas fa-book"></i>&ensp;Documentation</a>
109-
<a href="https://github.com/python-hyper/wsproto" class="card-footer-item"><i class="fab fa-github"></i>&ensp;GitHub</a>
108+
<a href="https://starlite-api.github.io/starlite" class="card-footer-item"><i class="fas fa-book"></i>&ensp;Documentation</a>
109+
<a href="https://github.com/starlite-api/starlite" class="card-footer-item"><i class="fab fa-github"></i>&ensp;GitHub</a>
110110
</div>
111111
</div>
112112

113113
<div class="card mb-4">
114114
<div class="card-content">
115115
<div class="content">
116-
<p class="subtitle">Starlite</p>
117-
<p>Starlite is a light and flexible ASGI API framework, using Starlette and Pydantic as foundations.
116+
<p class="subtitle">Sanic</p>
117+
<p>Sanic is an ASGI compliant web framework designed for speed and simplicity.
118118
</p>
119119
</div>
120120
</div>
121121
<div class="card-footer">
122-
<a href="https://starlite-api.github.io/starlite" class="card-footer-item"><i class="fas fa-book"></i>&ensp;Documentation</a>
123-
<a href="https://github.com/starlite-api/starlite" class="card-footer-item"><i class="fab fa-github"></i>&ensp;GitHub</a>
122+
<a href="https://sanic.dev/en/guide/advanced/websockets.html" class="card-footer-item"><i class="fas fa-book"></i>&ensp;Documentation</a>
123+
<a href="https://github.com/sanic-org/sanic" class="card-footer-item"><i class="fab fa-github"></i>&ensp;GitHub</a>
124124
</div>
125125
</div>
126126

127127
<div class="card mb-4">
128128
<div class="card-content">
129129
<div class="content">
130-
<p class="subtitle">Sanic</p>
131-
<p>Sanic is an ASGI compliant web framework designed for speed and simplicity.
130+
<p class="subtitle">wsproto</p>
131+
<p>wsproto is a pure-Python WebSocket protocol stack written to be as flexible as possible by having the user build the bridge to the I/O.
132132
</p>
133133
</div>
134134
</div>
135135
<div class="card-footer">
136-
<a href="https://sanic.dev/en/guide/advanced/websockets.html" class="card-footer-item"><i class="fas fa-book"></i>&ensp;Documentation</a>
137-
<a href="https://github.com/sanic-org/sanic" class="card-footer-item"><i class="fab fa-github"></i>&ensp;GitHub</a>
136+
<a href="https://python-hyper.org/projects/wsproto/en/stable" class="card-footer-item"><i class="fas fa-book"></i>&ensp;Documentation</a>
137+
<a href="https://github.com/python-hyper/wsproto" class="card-footer-item"><i class="fab fa-github"></i>&ensp;GitHub</a>
138138
</div>
139139
</div>
140140

pydis_site/templates/events/pages/code-jams/9/rules.html

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,17 @@
1212
{% block event_content %}
1313
<ol>
1414
<li><p>Your solution must use one of the approved frameworks (a list will be released soon). It is not permitted to circumvent this rule by e.g. using the approved framework as a wrapper for another framework.</p></li>
15+
<li>
16+
<p><strong>Your solution must only communicate through WebSockets</strong>. Any communication between the client and server (or any two server workers), must utilize WebSockets.</p>
17+
18+
<p>
19+
An exception to this rule is that communication with databases and files is allowed for accessing resources or for storage purposes.
20+
For example, you may use PostgreSQL as a database but not its `NOTIFY` command.
21+
Working with subprocesses (through stdin/stdout or <code>multiprocessing.Pool()</code>/<code>concurrent.futures.ProcessPoolExecutor()</code>) is also allowed.
22+
</p>
23+
24+
<p>If you're interested in utilizing a particular non-WebSocket method of communication, reach out to the Events Team for discussion and approval</p>
25+
</li>
1526
<li><p>Your solution should be platform agnostic. For example, if you use filepaths in your submission, use <code>pathlib</code> to create platform agnostic Path objects instead of hardcoding the paths.</p></li>
1627
<li>
1728
<p>

pydis_site/templates/events/pages/code-jams/_index.html

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@
88
{% block title %}Code Jams{% endblock %}
99

1010
{% block event_content %}
11-
<div class="block">
12-
<div class="notification is-success">
13-
The <b>2022 Summer Code Jam</b> is currently underway and you can still enter! <b>The qualifier is open until July 13</b>; check out the details <a href="{% url "events:page" path="code-jams/9" %}">here</a>.
14-
</div>
15-
</div>
16-
1711
<p>
1812
If you've been around the server for a while, or you just happened to join at the right time,
1913
you may have heard of something known as a Code Jam.

pydis_site/templates/home/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<!-- Mobile-only Code Jam Banner -->
1313
<section id="mobile-notice" class="is-primary is-hidden-tablet">
1414
<a href="/events/code-jams/9/">
15-
<img src="{% static "images/events/summer_code_jam_2022/front_page_banners/sign_up.png" %}" alt="Summer Code Jam 2022">
15+
<img src="{% static "images/events/summer_code_jam_2022/site_banner.png" %}" alt="Summer Code Jam 2022">
1616
</a>
1717
</section>
1818

@@ -48,7 +48,7 @@
4848
{# Code Jam Banner #}
4949
<div id="wave-hero-right" class="column is-half">
5050
<a href="/events/code-jams/9/">
51-
<img src="{% static "images/events/summer_code_jam_2022/front_page_banners/sign_up.png" %}" alt="Summer Code Jam 2022">
51+
<img src="{% static "images/events/summer_code_jam_2022/site_banner.png" %}" alt="Summer Code Jam 2022">
5252
</a>
5353
</div>
5454
</div>

0 commit comments

Comments
 (0)