From c40ed8c159f5101d1bc677a66406cef7c99843aa Mon Sep 17 00:00:00 2001
From: Chris
Date: Fri, 18 Jun 2021 22:16:53 +0100
Subject: Use BigInt for permissions field and remove max value validator
BigInt is needed as Discord's permissions number now exceeds that which can be stored
in a normal int. I have removed the max value validator, as this just adds
maintanence burden for us each time Discord adds new permissions.
---
.../apps/api/migrations/0070_auto_20210618_2114.py | 19 +++++++++++++++++++
pydis_site/apps/api/models/bot/role.py | 8 ++------
2 files changed, 21 insertions(+), 6 deletions(-)
create mode 100644 pydis_site/apps/api/migrations/0070_auto_20210618_2114.py
diff --git a/pydis_site/apps/api/migrations/0070_auto_20210618_2114.py b/pydis_site/apps/api/migrations/0070_auto_20210618_2114.py
new file mode 100644
index 00000000..1d25e421
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0070_auto_20210618_2114.py
@@ -0,0 +1,19 @@
+# Generated by Django 3.0.14 on 2021-06-18 21:14
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('api', '0069_documentationlink_validators'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='role',
+ name='permissions',
+ field=models.BigIntegerField(help_text='The integer value of the permission bitset of this role from Discord.', validators=[django.core.validators.MinValueValidator(limit_value=0, message='Role permissions cannot be negative.')]),
+ ),
+ ]
diff --git a/pydis_site/apps/api/models/bot/role.py b/pydis_site/apps/api/models/bot/role.py
index cfadfec4..733a8e08 100644
--- a/pydis_site/apps/api/models/bot/role.py
+++ b/pydis_site/apps/api/models/bot/role.py
@@ -1,6 +1,6 @@
from __future__ import annotations
-from django.core.validators import MaxValueValidator, MinValueValidator
+from django.core.validators import MinValueValidator
from django.db import models
from pydis_site.apps.api.models.mixins import ModelReprMixin
@@ -38,16 +38,12 @@ class Role(ModelReprMixin, models.Model):
),
help_text="The integer value of the colour of this role from Discord."
)
- permissions = models.IntegerField(
+ permissions = models.BigIntegerField(
validators=(
MinValueValidator(
limit_value=0,
message="Role permissions cannot be negative."
),
- MaxValueValidator(
- limit_value=2 << 32,
- message="Role permission bitset exceeds value of having all permissions"
- )
),
help_text="The integer value of the permission bitset of this role from Discord."
)
--
cgit v1.2.3
From e4acdf24ecfd8c2ce52ea56b73813e4bde4d8bec Mon Sep 17 00:00:00 2001
From: Janine vN
Date: Sun, 20 Jun 2021 11:38:19 -0400
Subject: Adding GitHub Bootcamp Information This commit adds some basic
information about the github bootcamp. More information should and will be
added later, but this adds some of the basics and adds it to the sidebar.
---
.../events/pages/code-jams/8/github-bootcamp.html | 40 ++++++++++++++++++++++
.../templates/events/sidebar/code-jams/8.html | 1 +
2 files changed, 41 insertions(+)
create mode 100644 pydis_site/templates/events/pages/code-jams/8/github-bootcamp.html
diff --git a/pydis_site/templates/events/pages/code-jams/8/github-bootcamp.html b/pydis_site/templates/events/pages/code-jams/8/github-bootcamp.html
new file mode 100644
index 00000000..a60afa33
--- /dev/null
+++ b/pydis_site/templates/events/pages/code-jams/8/github-bootcamp.html
@@ -0,0 +1,40 @@
+{% extends "events/base_sidebar.html" %}
+
+{% load static %}
+
+{% block title %}Summer Code Jam 2021{% endblock %}
+
+{% block breadcrumb %}
+ Events
+ Code Jams
+ Summer Code Jam 2021
+ GitHub Bootcamp
+{% endblock %}
+
+{% block event_content %}
+
+ This year we'll be running a GitHub Bootcamp on Saturday, June 26th.
+ This bootcamp is intended to be an interactive workshop session where we help participants
+ get setup with git and using it in a team environment.
+
+ Session 1: Setting up Git
+
+ This session will run for an hour and be focused on installing and setting up git for the first time.
+ We'll have helpers available to help you set up git and get it integreated with your editor of choice.
+ Whether it's PyCharm, VSCode, or vim, we can help you get rolling with version control.
+
+ Session 2: Using git and github in a team environment
+
+ This session will run for an hour. It will be focused on using git and HitHub in a team environment.
+ You'll be put in a group of people with a repo to work on.
+
+
+
+
+{% endblock %}
+
+{% block sidebar %}
+
+ {% include "events/sidebar/code-jams/8.html" %}
+
+{% endblock %}
diff --git a/pydis_site/templates/events/sidebar/code-jams/8.html b/pydis_site/templates/events/sidebar/code-jams/8.html
index fe65ae2e..3d5a5447 100644
--- a/pydis_site/templates/events/sidebar/code-jams/8.html
+++ b/pydis_site/templates/events/sidebar/code-jams/8.html
@@ -3,6 +3,7 @@
Important Links
Rules
Approved Frameworks
+ GitHub Bootcamp
--
cgit v1.2.3
From 8ed04b26d64bb1d3191a94e78db190c46a823473 Mon Sep 17 00:00:00 2001
From: Janine vN
Date: Sun, 20 Jun 2021 12:23:10 -0400
Subject: Add in information about the Qualifier This adds in a section about
the qualifier and links to it and the sign-up form.
---
.../templates/events/pages/code-jams/8/_index.html | 27 ++++++++++++++++++----
1 file changed, 22 insertions(+), 5 deletions(-)
diff --git a/pydis_site/templates/events/pages/code-jams/8/_index.html b/pydis_site/templates/events/pages/code-jams/8/_index.html
index 799beca1..1f08fb66 100644
--- a/pydis_site/templates/events/pages/code-jams/8/_index.html
+++ b/pydis_site/templates/events/pages/code-jams/8/_index.html
@@ -21,9 +21,9 @@
- Tuesday, June 15 - Form to submit theme suggestions opens
- - Monday, June 21 - The Qualifier is released
+ - Monday, June 21 - The Qualifier is released
- Friday, June 25 - Voting for the theme opens
- - Sunday, June 27 - GitHub Bootcamp
+ - Sunday, June 27 - GitHub Bootcamp
- Wednesday, June 30 - The Qualifier closes
- Friday, July 9 - Code Jam begins
- Friday, July 16 - Coding portion of the jam ends
@@ -36,10 +36,27 @@
Each team must create a program with one of the approved frameworks that creates a user interface that is text based.
For more information of TUIs and what's involved with such an interface, check out this wikipedia article.
-
+
+
+ The qualifier is a coding challenge that you are required to complete before registering for the code jam.
+ This is meant as a basic assessment of your skills to ensure you have enough python knowledge to effectively contribute in a team environment.
+
+ View the Qualifier
+ Please note the requirements for the qualifier.
+
+ - The qualifier must be completed using Python 3.9
+ - No external modules are allowed, only those available through the standard library.
+ - The Qualifier must be submitted through the Code Jam sign-up form.
+
+
- The Qualifier isn't released yet, but to receive the most up-to-date information and to get notified
- when the Qualifier is released you can join us on Discord at discord.gg/python.
+
+ To enter into the code jam you must complete The Qualifier and submit the sign-up form.
+ Don't forget to join us on Discord at discord.gg/python!
+
+
+
{% endblock %}
{% block sidebar %}
--
cgit v1.2.3
From ef5f4b71397886f6a208f85d88e649c13c7774ad Mon Sep 17 00:00:00 2001
From: Janine vN
Date: Sun, 20 Jun 2021 14:15:13 -0400
Subject: Add Tabnine as a sponsor Adds tabnine as a sponsor on the events
sidebar.
---
pydis_site/static/images/events/Tabnine.png | Bin 0 -> 10534 bytes
pydis_site/templates/events/sidebar/code-jams/8.html | 3 +++
2 files changed, 3 insertions(+)
create mode 100644 pydis_site/static/images/events/Tabnine.png
diff --git a/pydis_site/static/images/events/Tabnine.png b/pydis_site/static/images/events/Tabnine.png
new file mode 100644
index 00000000..eee42a5e
Binary files /dev/null and b/pydis_site/static/images/events/Tabnine.png differ
diff --git a/pydis_site/templates/events/sidebar/code-jams/8.html b/pydis_site/templates/events/sidebar/code-jams/8.html
index 3d5a5447..c1afdf47 100644
--- a/pydis_site/templates/events/sidebar/code-jams/8.html
+++ b/pydis_site/templates/events/sidebar/code-jams/8.html
@@ -15,4 +15,7 @@
+
+
+
--
cgit v1.2.3
From 35fb561256e19aafcd7800fb275d3497bcd59680 Mon Sep 17 00:00:00 2001
From: Janine vN
Date: Sun, 20 Jun 2021 14:25:45 -0400
Subject: Adds Prizes section to CJ8 page This adds a Prizes section to the
Code Jam 8 page. Links, descriptions, and a quick summation of the prizes
offered by each sponsor is included.
The Python Discord prizes should also be included at a later date.
---
.../templates/events/pages/code-jams/8/_index.html | 65 ++++++++++++++++++++++
1 file changed, 65 insertions(+)
diff --git a/pydis_site/templates/events/pages/code-jams/8/_index.html b/pydis_site/templates/events/pages/code-jams/8/_index.html
index 1f08fb66..6539e63a 100644
--- a/pydis_site/templates/events/pages/code-jams/8/_index.html
+++ b/pydis_site/templates/events/pages/code-jams/8/_index.html
@@ -1,5 +1,7 @@
{% extends "events/base_sidebar.html" %}
+{% load static %}
+
{% block title %}Summer Code Jam 2021{% endblock %}
{% block breadcrumb %}
@@ -56,6 +58,69 @@
Don't forget to join us on Discord at discord.gg/python!
+
+
+ Our Code Jam Sponsors have provided prizes for the winners of the code jam.
+ Also, a big thank you to our Patreon patrons for supporting this server and allowing us
+ to provide our prizes as well.
+
+
+
+
+
+
{% endblock %}
--
cgit v1.2.3
From 115220eee2e977e00b720a97e3dde0cf4a7497d2 Mon Sep 17 00:00:00 2001
From: Joe Banks
Date: Mon, 21 Jun 2021 16:58:36 +0100
Subject: Remove RLBot from Communities list
---
pydis_site/apps/resources/resources/communities/rlbot.yaml | 13 -------------
1 file changed, 13 deletions(-)
delete mode 100644 pydis_site/apps/resources/resources/communities/rlbot.yaml
diff --git a/pydis_site/apps/resources/resources/communities/rlbot.yaml b/pydis_site/apps/resources/resources/communities/rlbot.yaml
deleted file mode 100644
index d12c1dec..00000000
--- a/pydis_site/apps/resources/resources/communities/rlbot.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-description: RLBot is a community of programmers making awesome Rocket League bots.
- They've created a framework that you can use to write bots in a number of languages (including Python),
- and they host regular tournaments where botmakers can pit their creations against each other.
-title_image: https://i.imgur.com/S8L1muZ.png
-title_url: https://discord.gg/4JJdJKb
-position: 7
-urls:
- - icon: branding/discord
- url: https://discord.gg/4JJdJKb
- color: blurple
- - icon: regular/link
- url: https://www.rlbot.org/
- color: teal
--
cgit v1.2.3
From 5d8ab6c282ba4e9c335f0a65f243ff3d301b61a6 Mon Sep 17 00:00:00 2001
From: Janine vN
Date: Mon, 21 Jun 2021 12:56:48 -0400
Subject: Update qualifier repo and sign-up link
---
pydis_site/templates/events/pages/code-jams/8/_index.html | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pydis_site/templates/events/pages/code-jams/8/_index.html b/pydis_site/templates/events/pages/code-jams/8/_index.html
index 6539e63a..10a5e750 100644
--- a/pydis_site/templates/events/pages/code-jams/8/_index.html
+++ b/pydis_site/templates/events/pages/code-jams/8/_index.html
@@ -23,7 +23,7 @@
- Tuesday, June 15 - Form to submit theme suggestions opens
- - Monday, June 21 - The Qualifier is released
+ - Monday, June 21 - The Qualifier is released
- Friday, June 25 - Voting for the theme opens
- Sunday, June 27 - GitHub Bootcamp
- Wednesday, June 30 - The Qualifier closes
@@ -43,7 +43,7 @@
The qualifier is a coding challenge that you are required to complete before registering for the code jam.
This is meant as a basic assessment of your skills to ensure you have enough python knowledge to effectively contribute in a team environment.
- View the Qualifier
View the Qualifier
Please note the requirements for the qualifier.
@@ -56,7 +56,7 @@
To enter into the code jam you must complete The Qualifier and submit the sign-up form.
Don't forget to join us on Discord at discord.gg/python!
-
+
--
cgit v1.2.3
From c2d096dbf9205b420e70171354ffd39a6e0e2400 Mon Sep 17 00:00:00 2001
From: Janine vN
Date: Mon, 21 Jun 2021 13:17:37 -0400
Subject: Spell GitHub's name correctly One day I'll spell GitHub correctly and
consistently. One day...
---
pydis_site/templates/events/pages/code-jams/8/github-bootcamp.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pydis_site/templates/events/pages/code-jams/8/github-bootcamp.html b/pydis_site/templates/events/pages/code-jams/8/github-bootcamp.html
index a60afa33..18951e48 100644
--- a/pydis_site/templates/events/pages/code-jams/8/github-bootcamp.html
+++ b/pydis_site/templates/events/pages/code-jams/8/github-bootcamp.html
@@ -25,7 +25,7 @@
Session 2: Using git and github in a team environment
- This session will run for an hour. It will be focused on using git and HitHub in a team environment.
+ This session will run for an hour. It will be focused on using git and GitHub in a team environment.
You'll be put in a group of people with a repo to work on.
--
cgit v1.2.3
From a0767f7bef47a542c51b06bfc7ff75ac4a7bdaf1 Mon Sep 17 00:00:00 2001
From: Janine vN
Date: Mon, 21 Jun 2021 13:19:01 -0400
Subject: Clarify prize details Clarify that each member of a winning team gets
one of the licenses as a prize. They don't have to Lord of Flies duel it out.
---
pydis_site/templates/events/pages/code-jams/8/_index.html | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pydis_site/templates/events/pages/code-jams/8/_index.html b/pydis_site/templates/events/pages/code-jams/8/_index.html
index 10a5e750..9b75188c 100644
--- a/pydis_site/templates/events/pages/code-jams/8/_index.html
+++ b/pydis_site/templates/events/pages/code-jams/8/_index.html
@@ -78,7 +78,7 @@
We make it simple to launch in the cloud and scale up as you grow—whether you’re running one virtual machine or ten thousand.
Prizes
- $250 in DigitalOcean credits to a winning team.
+ $250 in DigitalOcean credits to the members of a winning team.
@@ -98,7 +98,7 @@
We provide tools to explore and familiarize with code bases faster. Our products make it easy for you to take care of quality during all stages of development and spend less time on maintenance tasks.
Prizes
- 1-year JetBrain licenses to a winning team.
+ 1-year JetBrain licenses to the members of a winning team.
@@ -116,7 +116,7 @@
Tabnine comes as a plugin and has a free-forever basic plan, so you can get started with it right away!
Prizes
- 1-year Pro Licenses to Tabnine to a winning team.
+ 1-year Pro Licenses to Tabnine to the members of a winning team.
--
cgit v1.2.3
From 89e52ce860b598cc7575af82b6b7134f246c3e26 Mon Sep 17 00:00:00 2001
From: Boris Muratov <8bee278@gmail.com>
Date: Wed, 23 Jun 2021 14:24:40 +0300
Subject: Update git bootcamp date
---
pydis_site/templates/events/pages/code-jams/8/_index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pydis_site/templates/events/pages/code-jams/8/_index.html b/pydis_site/templates/events/pages/code-jams/8/_index.html
index 9b75188c..9ebca7c7 100644
--- a/pydis_site/templates/events/pages/code-jams/8/_index.html
+++ b/pydis_site/templates/events/pages/code-jams/8/_index.html
@@ -25,7 +25,7 @@
- Tuesday, June 15 - Form to submit theme suggestions opens
- Monday, June 21 - The Qualifier is released
- Friday, June 25 - Voting for the theme opens
- - Sunday, June 27 - GitHub Bootcamp
+ - Saturday, June 26 - GitHub Bootcamp
- Wednesday, June 30 - The Qualifier closes
- Friday, July 9 - Code Jam begins
- Friday, July 16 - Coding portion of the jam ends
--
cgit v1.2.3
From fa42a72ae957e8e62d1f554a8f21af5b8f247777 Mon Sep 17 00:00:00 2001
From: Janine vN
Date: Wed, 23 Jun 2021 21:44:08 -0400
Subject: Updating bootcamp information Adds time and more information about
the GitHub bootcamp.
---
.../templates/events/pages/code-jams/8/_index.html | 2 +-
.../events/pages/code-jams/8/github-bootcamp.html | 21 +++++++++++++--------
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/pydis_site/templates/events/pages/code-jams/8/_index.html b/pydis_site/templates/events/pages/code-jams/8/_index.html
index 9ebca7c7..d3d3cc0f 100644
--- a/pydis_site/templates/events/pages/code-jams/8/_index.html
+++ b/pydis_site/templates/events/pages/code-jams/8/_index.html
@@ -25,7 +25,7 @@
- Tuesday, June 15 - Form to submit theme suggestions opens
- Monday, June 21 - The Qualifier is released
- Friday, June 25 - Voting for the theme opens
- - Saturday, June 26 - GitHub Bootcamp
+ - Saturday, June 26 @ 12PM UTC- GitHub Bootcamp
- Wednesday, June 30 - The Qualifier closes
- Friday, July 9 - Code Jam begins
- Friday, July 16 - Coding portion of the jam ends
diff --git a/pydis_site/templates/events/pages/code-jams/8/github-bootcamp.html b/pydis_site/templates/events/pages/code-jams/8/github-bootcamp.html
index 18951e48..bac03d11 100644
--- a/pydis_site/templates/events/pages/code-jams/8/github-bootcamp.html
+++ b/pydis_site/templates/events/pages/code-jams/8/github-bootcamp.html
@@ -13,24 +13,29 @@
{% block event_content %}
- This year we'll be running a GitHub Bootcamp on Saturday, June 26th.
+ This year we'll be running a GitHub Bootcamp on Saturday, June 26th at 4PM UTC.
This bootcamp is intended to be an interactive workshop session where we help participants
- get setup with git and using it in a team environment.
+ get setup with git and using it in a team environment. If you are new to git or would like to brush up on it,
+ then this is the perfect event for you.
+
+
+ The instructional parts of this bootcamp will be recorded. We'll also be providing a cheatsheet / reference guide to all attendees that will
+ be made available here for download.
Session 1: Setting up Git
- This session will run for an hour and be focused on installing and setting up git for the first time.
- We'll have helpers available to help you set up git and get it integreated with your editor of choice.
+ This first session will run for an hour starting at 4PM UTC. It will be focused on installing and setting up git for the first time.
+ We'll have helpers available to help you set up git and integreated with your editor of choice.
Whether it's PyCharm, VSCode, or vim, we can help you get rolling with version control.
Session 2: Using git and github in a team environment
- This session will run for an hour. It will be focused on using git and GitHub in a team environment.
- You'll be put in a group of people with a repo to work on.
+ This session will run for an hour starting at 5PM UTC. It will be focused on using git and GitHub in a team environment.
+ You'll be put in a group with other attendees and use the common git commands for working in a repo.
+ You'll learn how to set-up a GitHub reposity with other contributors, how to make branches, make commits, pull down changes, and then make pull requests.
+ We'll also be going over different strategies for creating branches and best practices for commits and pull requests.
-
-
{% endblock %}
{% block sidebar %}
--
cgit v1.2.3
From 57a6ff40d3abbad39db1394b679c5358bfa9b274 Mon Sep 17 00:00:00 2001
From: Janine vN
Date: Wed, 23 Jun 2021 22:01:50 -0400
Subject: Change time to UTC
---
pydis_site/templates/events/pages/code-jams/8/_index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pydis_site/templates/events/pages/code-jams/8/_index.html b/pydis_site/templates/events/pages/code-jams/8/_index.html
index d3d3cc0f..c510c250 100644
--- a/pydis_site/templates/events/pages/code-jams/8/_index.html
+++ b/pydis_site/templates/events/pages/code-jams/8/_index.html
@@ -25,7 +25,7 @@
- Tuesday, June 15 - Form to submit theme suggestions opens
- Monday, June 21 - The Qualifier is released
- Friday, June 25 - Voting for the theme opens
- - Saturday, June 26 @ 12PM UTC- GitHub Bootcamp
+ - Saturday, June 26 @ 4PM UTC- GitHub Bootcamp
- Wednesday, June 30 - The Qualifier closes
- Friday, July 9 - Code Jam begins
- Friday, July 16 - Coding portion of the jam ends
--
cgit v1.2.3
From 0284db7f24fb1f624e0b548894d5248eb0eba1f5 Mon Sep 17 00:00:00 2001
From: Janine vN
Date: Wed, 23 Jun 2021 22:08:37 -0400
Subject: Fix typos
---
pydis_site/templates/events/pages/code-jams/8/github-bootcamp.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pydis_site/templates/events/pages/code-jams/8/github-bootcamp.html b/pydis_site/templates/events/pages/code-jams/8/github-bootcamp.html
index bac03d11..836ed3ed 100644
--- a/pydis_site/templates/events/pages/code-jams/8/github-bootcamp.html
+++ b/pydis_site/templates/events/pages/code-jams/8/github-bootcamp.html
@@ -25,14 +25,14 @@
Session 1: Setting up Git
This first session will run for an hour starting at 4PM UTC. It will be focused on installing and setting up git for the first time.
- We'll have helpers available to help you set up git and integreated with your editor of choice.
+ We'll have helpers available to help you set up git and integrated with your editor of choice.
Whether it's PyCharm, VSCode, or vim, we can help you get rolling with version control.
Session 2: Using git and github in a team environment
This session will run for an hour starting at 5PM UTC. It will be focused on using git and GitHub in a team environment.
You'll be put in a group with other attendees and use the common git commands for working in a repo.
- You'll learn how to set-up a GitHub reposity with other contributors, how to make branches, make commits, pull down changes, and then make pull requests.
+ You'll learn how to set-up a GitHub repository with other contributors, how to make branches, make commits, pull down changes, and then make pull requests.
We'll also be going over different strategies for creating branches and best practices for commits and pull requests.
--
cgit v1.2.3