From a56e02b15e05f02316c9f23095907b02df3c8e5a Mon Sep 17 00:00:00 2001 From: swfarnsworth Date: Sun, 6 Jun 2021 15:15:03 -0400 Subject: Create issue template for resource suggestions. --- .github/ISSUE_TEMPLATE/resource_suggestion.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/resource_suggestion.md diff --git a/.github/ISSUE_TEMPLATE/resource_suggestion.md b/.github/ISSUE_TEMPLATE/resource_suggestion.md new file mode 100644 index 00000000..f09f8a9b --- /dev/null +++ b/.github/ISSUE_TEMPLATE/resource_suggestion.md @@ -0,0 +1,21 @@ +--- +name: Resource Suggestion +about: Suggest a resource for the Python Discord resource index. +title: 'Resource Suggestion: ' +labels: 'resource suggestion' +assignees: 'swfarnsworth' +--- + +**Resource name** + +**Resource location**\ +Should be a link of some kind, either to the resource itself or (in the case of resources that must be purchased) an information page about it. + +**Payment type**\ +Options are free, paid, and subscription. Combinations of these are allowed for special cases (like a limited free version). + +**Why it should be included**\ +A brief explanation for why you think this resource is valuable. + +**Potential limitations**\ +Is the resource easy to use? Does it contain good information but have poorly-written code? Is it outdated in some way? If so, explain why it should still be included. -- cgit v1.2.3 From 1fd6c9bdb0164c9953a4d55277d829009332aa4a Mon Sep 17 00:00:00 2001 From: Kronifer <44979306+Kronifer@users.noreply.github.com> Date: Thu, 10 Jun 2021 08:36:56 -0500 Subject: Added Cloudflare to Sponsors list (#527) --- pydis_site/static/images/sponsors/cloudflare.png | Bin 0 -> 13822 bytes pydis_site/templates/home/index.html | 2 ++ 2 files changed, 2 insertions(+) create mode 100644 pydis_site/static/images/sponsors/cloudflare.png diff --git a/pydis_site/static/images/sponsors/cloudflare.png b/pydis_site/static/images/sponsors/cloudflare.png new file mode 100644 index 00000000..e2cd3b44 Binary files /dev/null and b/pydis_site/static/images/sponsors/cloudflare.png differ diff --git a/pydis_site/templates/home/index.html b/pydis_site/templates/home/index.html index 18f6b77b..08f98607 100644 --- a/pydis_site/templates/home/index.html +++ b/pydis_site/templates/home/index.html @@ -200,6 +200,8 @@ StreamYard + + Cloudflare -- cgit v1.2.3 From b8132bd77c32ec07134605a0f047a614ec8ce379 Mon Sep 17 00:00:00 2001 From: Janine vN Date: Mon, 14 Jun 2021 22:36:18 -0400 Subject: Code Jam 8 - Initial PR for Announcement (#528) --- .../static/images/events/cj8_asciimatics.png | Bin 0 -> 26219 bytes pydis_site/static/images/events/cj8_blessed.gif | Bin 0 -> 41307 bytes pydis_site/static/images/events/cj8_curses.png | Bin 0 -> 6483 bytes pydis_site/static/images/events/cj8_rich.gif | Bin 0 -> 906975 bytes pydis_site/static/images/events/cj8_urwid.png | Bin 0 -> 318 bytes .../static/images/events/summer_code_jam_2021.png | Bin 0 -> 738161 bytes pydis_site/templates/events/index.html | 3 + .../templates/events/pages/code-jams/8/_index.html | 41 +++++++++ .../events/pages/code-jams/8/frameworks.html | 92 +++++++++++++++++++++ .../templates/events/pages/code-jams/8/rules.html | 70 ++++++++++++++++ .../templates/events/sidebar/code-jams/8.html | 17 ++++ .../sidebar/code-jams/previous-code-jams.html | 1 + .../sidebar/code-jams/upcoming-code-jam.html | 6 +- .../templates/events/sidebar/upcoming-event.html | 4 +- 14 files changed, 229 insertions(+), 5 deletions(-) create mode 100644 pydis_site/static/images/events/cj8_asciimatics.png create mode 100644 pydis_site/static/images/events/cj8_blessed.gif create mode 100644 pydis_site/static/images/events/cj8_curses.png create mode 100644 pydis_site/static/images/events/cj8_rich.gif create mode 100644 pydis_site/static/images/events/cj8_urwid.png create mode 100644 pydis_site/static/images/events/summer_code_jam_2021.png create mode 100644 pydis_site/templates/events/pages/code-jams/8/_index.html create mode 100644 pydis_site/templates/events/pages/code-jams/8/frameworks.html create mode 100644 pydis_site/templates/events/pages/code-jams/8/rules.html create mode 100644 pydis_site/templates/events/sidebar/code-jams/8.html diff --git a/pydis_site/static/images/events/cj8_asciimatics.png b/pydis_site/static/images/events/cj8_asciimatics.png new file mode 100644 index 00000000..ac52338e Binary files /dev/null and b/pydis_site/static/images/events/cj8_asciimatics.png differ diff --git a/pydis_site/static/images/events/cj8_blessed.gif b/pydis_site/static/images/events/cj8_blessed.gif new file mode 100644 index 00000000..8bdbf5b1 Binary files /dev/null and b/pydis_site/static/images/events/cj8_blessed.gif differ diff --git a/pydis_site/static/images/events/cj8_curses.png b/pydis_site/static/images/events/cj8_curses.png new file mode 100644 index 00000000..c1a177ff Binary files /dev/null and b/pydis_site/static/images/events/cj8_curses.png differ diff --git a/pydis_site/static/images/events/cj8_rich.gif b/pydis_site/static/images/events/cj8_rich.gif new file mode 100644 index 00000000..3a0ffbf3 Binary files /dev/null and b/pydis_site/static/images/events/cj8_rich.gif differ diff --git a/pydis_site/static/images/events/cj8_urwid.png b/pydis_site/static/images/events/cj8_urwid.png new file mode 100644 index 00000000..98a264b7 Binary files /dev/null and b/pydis_site/static/images/events/cj8_urwid.png differ diff --git a/pydis_site/static/images/events/summer_code_jam_2021.png b/pydis_site/static/images/events/summer_code_jam_2021.png new file mode 100644 index 00000000..778c7c90 Binary files /dev/null and b/pydis_site/static/images/events/summer_code_jam_2021.png differ diff --git a/pydis_site/templates/events/index.html b/pydis_site/templates/events/index.html index 024e7fdc..64bf2c25 100644 --- a/pydis_site/templates/events/index.html +++ b/pydis_site/templates/events/index.html @@ -9,6 +9,9 @@ {% block event_content %}

Code Jams

+
+ The 2021 Summer Code Jam qualifier will open June 21st. Check out the details here. +

Each year, we organize a Winter Code Jam and a Summer Code Jam. During these events, members of our community will work together in teams to create something amazing using a technology we picked for them. One such technology that was picked for the Winter Code Jam 2020 was Kivy, a cross-platform GUI framework.

To help fuel the creative process, we provide a specific theme, like Ancient Technology or This App Hates You. 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.

If you want to read more about Code Jams, visit our Code Jam info page or watch this video showcasing the best projects created during the Winter Code Jam 2020: Ancient Technology:

diff --git a/pydis_site/templates/events/pages/code-jams/8/_index.html b/pydis_site/templates/events/pages/code-jams/8/_index.html new file mode 100644 index 00000000..08eaae07 --- /dev/null +++ b/pydis_site/templates/events/pages/code-jams/8/_index.html @@ -0,0 +1,41 @@ +{% extends "events/base_sidebar.html" %} + +{% block title %}Summer Code Jam 2021{% endblock %} + +{% block breadcrumb %} +
  • Events
    • +
  • Code Jams
    • +
  • Summer Code Jam 2021
    • +{% endblock %} + +{% block event_content %} +

    Twice a year we host a code jam for members of our server to participate in. The code jam is an event where we place you + in a team with 5 other random server members. You then have 7 days to code some sort of application or program in Python. + Your program must use the specified technology/framework and incorporate the theme chosen by the server. +

    +

    + After the 7 days is complete, your team has 2 days to finish documentation and create a video presentation showcasing + and walking through the program that your team has created. More details and specifics of this will be released within the next 2 weeks. +

    + +

    Important Dates

    +
      +
    • Monday, 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
      • +
    • Wednesday, June 30 - The Qualifier closes
      • +
    • Friday, July 9 - Code Jam Begins
      • +
    • Friday, July 16 - Coding portion of the jam ends
      • +
    • Sunday, July 18 - Code Jam submissions are closed
      • +
    +

    How to Join

    +

    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 the server: discord.gg/python.

    +{% endblock %} + +{% block sidebar %} + + {% include "events/sidebar/code-jams/8.html" %} + +{% endblock %} diff --git a/pydis_site/templates/events/pages/code-jams/8/frameworks.html b/pydis_site/templates/events/pages/code-jams/8/frameworks.html new file mode 100644 index 00000000..64ff7a0c --- /dev/null +++ b/pydis_site/templates/events/pages/code-jams/8/frameworks.html @@ -0,0 +1,92 @@ +{% extends "events/base_sidebar.html" %} + +{% load static %} + +{% block title %}Summer Code Jam 2021{% endblock %} + +{% block breadcrumb %} +
  • Events
    • +
  • Code Jams
    • +
  • Summer Code Jam 2021
    • +
  • Allowed Frameworks
    • +{% endblock %} + +{% block event_content %} +

    Below is the list of approved frameworks that you can use for the code jam. Please take note of what frameworks are available for which platform. + Please work with your team to choose a library that everyone can develop on, whether it's cross platform or something you can use WSL or a Virtual Machine for. +

    +

    Urwid

    +
    +
    +
      +
    • Supports: Linux, Mac, other unix-like OS
      • +
    • Somewhat in-depth tutorial
      • +
    • Uses widgets in a fairly straight forward design
      • +
    • Docs include tutorials of both functional and class-based examples
      • +
    +
    +
    + urwid +
    +
    +

    Curses

    +
    +
    +
      +
    • Supports: Linux and other unix-like OS
      • +
    • Part of the standard library
      • +
    • Extensive how-to guide
      • +
    • Very basic, more effort to get working/looking good
      • +
    +
    +
    + curses +
    +
    +

    Blessed

    +
    +
    +
      +
    • Supports: Linux, Mac, and Windows
      • +
    • Sits on top of curses to add more pythonic bindings
      • +
    • Doesn't provide any widgets or layouts
      • +
    +
    +
    + blessed +
    +
    +

    Rich

    +
    +
    +
      +
    • Supports: Linux, Mac, and Windows
      • +
    • Documentation is good and overall is very OOP focused
      • +
    • Robust with many features and example snippets
      • +
    +
    +
    + rich +
    +
    +

    Asciimatics

    +
    +
    +
      +
    • Supports: Linux, Mac, and Windows
      • +
    • Documentation is well structured and straightforward to navigate
      • +
    +
    +
    + asciimatics +
    +
    + + +{% endblock %} + +{% block sidebar %} + + {% include "events/sidebar/code-jams/8.html" %} + +{% endblock %} diff --git a/pydis_site/templates/events/pages/code-jams/8/rules.html b/pydis_site/templates/events/pages/code-jams/8/rules.html new file mode 100644 index 00000000..632ca877 --- /dev/null +++ b/pydis_site/templates/events/pages/code-jams/8/rules.html @@ -0,0 +1,70 @@ +{% extends "events/base_sidebar.html" %} + +{% block title %}Summer Code Jam 2021{% endblock %} + +{% block breadcrumb %} +
  • Events
    • +
  • Code Jams
    • +
  • Summer Code Jam 2021
    • +
  • Rules
    • +{% endblock %} + +{% block event_content %} +
      +

    1. Your solution must use one of the approved frameworks. It is not permitted to circumvent this rule by e.g. using the approved framework as a wrapper for another framework.

      2. +

    2. Your solution should be platform agnostic. For example, if you use filepaths in your submission, use pathlib to create platform agnostic Path objects instead of hardcoding the paths.

      3. +
    3. +

      + You must document precisely how to install and run your project. + This should be as easy as possible, which means you should consider using dependency managers like pipenv or poetry. + We would also encourage you to use docker and docker-compose to containerize your project, but this isn't a requirement. +

      +
      4. +
    4. + You must get contributions from every member of your team, if you have an issue with someone on your team please contact a member of the administration team. + These contributions do not necessarily have to be code, for example it's absolutely fine for someone to contribute management, documentation, graphics or audio. + + Team members that do not contribute will be removed from the Code Jam, and will not receive their share of any prizes the team may win. + They may also be barred from entering future events. + +
      5. +

    5. You must use GitHub as source control.

      6. +
    6. +

      + All code and assets must be compatible with the MIT license. + This is because we will be merging your submission into our summer-code-jam-2021 repo at the end of the jam, + and this repo is licensed with the MIT license. + Projects that include assets that are incompatible with this license may be disqualified. +

      +
      7. +

    7. All code must be written and committed within the time constrictions of the jam. Late commits may be reverted, so make sure you leave enough time to bug test your program.

      8. +
    8. +

      + Use English as the main language for your project, including names, comments, documentation, and commit messages. + The text displayed in your web application should also be in English, + although you are allowed to provide the user with options for internationalisation and translation. +

      +
      9. +
    9. +

      + Your team, once the coding portion of the code jam is complete, must create a video presentation that showcases and explains your final product. + This must be in a video format and must be uploaded somewhere for the judges to view (i.e. unlisted Youtube video, Vimeo, etc.) + The video can be as simple as a screen recording with annotated text. + Teams who do not submit a final video presentation may be disqualified. +

      +
      10. +
    + + +
    + Please note that our regular + community rules and code of conduct + also apply during the event and that we reserve the right to make changes to these rules at any time. +
    +{% 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 new file mode 100644 index 00000000..fb14d83e --- /dev/null +++ b/pydis_site/templates/events/sidebar/code-jams/8.html @@ -0,0 +1,17 @@ +{% load static %} +
    +

    Important Links

    + Rules + Approved Frameworks + +
    +
    + Summer Code Jam 2021 +

    Our Sponsors

    + + Django + + + JetBrains + +
    diff --git a/pydis_site/templates/events/sidebar/code-jams/previous-code-jams.html b/pydis_site/templates/events/sidebar/code-jams/previous-code-jams.html index 154f6ac4..9f9ecd1a 100644 --- a/pydis_site/templates/events/sidebar/code-jams/previous-code-jams.html +++ b/pydis_site/templates/events/sidebar/code-jams/previous-code-jams.html @@ -1,6 +1,7 @@

    Previous Code Jams

      +
    • Code Jam 7: Early Internet
    • Code Jam 6: Ancient Technology
    • Code Jam 5: Climate Change
    • Code Jam 4: This App Hates You
      • diff --git a/pydis_site/templates/events/sidebar/code-jams/upcoming-code-jam.html b/pydis_site/templates/events/sidebar/code-jams/upcoming-code-jam.html index 914a9545..10494ad8 100644 --- a/pydis_site/templates/events/sidebar/code-jams/upcoming-code-jam.html +++ b/pydis_site/templates/events/sidebar/code-jams/upcoming-code-jam.html @@ -1,8 +1,8 @@ {% load static %}
      -

      Upcoming Code Jam

      - - +

      Upcoming Code Jam

      +       + Summer Code Jam 2021
      diff --git a/pydis_site/templates/events/sidebar/upcoming-event.html b/pydis_site/templates/events/sidebar/upcoming-event.html index 5c1d925a..d8ea18e0 100644 --- a/pydis_site/templates/events/sidebar/upcoming-event.html +++ b/pydis_site/templates/events/sidebar/upcoming-event.html @@ -2,7 +2,7 @@

      Upcoming Event

      - - + + Summer Code Jam 2021
      -- cgit v1.2.3 From 522f14a9a201d9bf744dce53848929ffe8df3871 Mon Sep 17 00:00:00 2001 From: Janine vN Date: Tue, 15 Jun 2021 11:20:31 -0400 Subject: Code Jam 8 Site Updates - v2 (#530) Co-authored-by: Joe Banks --- .../static/images/events/DO_Logo_Vertical_Blue.png | Bin 0 -> 7156 bytes pydis_site/templates/base/navbar.html | 13 +++---------- .../templates/events/pages/code-jams/8/_index.html | 16 ++++++++++++---- .../templates/events/pages/code-jams/8/frameworks.html | 7 ++++++- .../templates/events/pages/code-jams/8/rules.html | 7 +++---- pydis_site/templates/events/sidebar/code-jams/8.html | 4 ++-- 6 files changed, 26 insertions(+), 21 deletions(-) create mode 100644 pydis_site/static/images/events/DO_Logo_Vertical_Blue.png diff --git a/pydis_site/static/images/events/DO_Logo_Vertical_Blue.png b/pydis_site/static/images/events/DO_Logo_Vertical_Blue.png new file mode 100644 index 00000000..ad528652 Binary files /dev/null and b/pydis_site/static/images/events/DO_Logo_Vertical_Blue.png differ diff --git a/pydis_site/templates/base/navbar.html b/pydis_site/templates/base/navbar.html index 4cc49dc6..ee458b03 100644 --- a/pydis_site/templates/base/navbar.html +++ b/pydis_site/templates/base/navbar.html @@ -70,6 +70,9 @@ Tools + + Events + Contributing @@ -88,16 +91,6 @@ Privacy -
      -
      - Events -
      - - Most Recent: Code Jam 7 - - - All events -
    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 08eaae07..799beca1 100644 --- a/pydis_site/templates/events/pages/code-jams/8/_index.html +++ b/pydis_site/templates/events/pages/code-jams/8/_index.html @@ -20,18 +20,26 @@

    Important Dates

    + +

    Technology

    +

    + The chosen technology/tech stack for this year is Text User Interfaces (TUIs). + 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. +

    +

    How to Join

    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 the server: discord.gg/python.

    + when the Qualifier is released you can join us on Discord at discord.gg/python.

    {% endblock %} {% block sidebar %} diff --git a/pydis_site/templates/events/pages/code-jams/8/frameworks.html b/pydis_site/templates/events/pages/code-jams/8/frameworks.html index 64ff7a0c..cc1aa671 100644 --- a/pydis_site/templates/events/pages/code-jams/8/frameworks.html +++ b/pydis_site/templates/events/pages/code-jams/8/frameworks.html @@ -8,7 +8,7 @@
  • Events
  • Code Jams
  • Summer Code Jam 2021
    • -
  • Allowed Frameworks
    • +
  • Approved Frameworks
    • {% endblock %} {% block event_content %} @@ -19,6 +19,7 @@
      +
    • Documentation Link
    • Supports: Linux, Mac, other unix-like OS
    • Somewhat in-depth tutorial
    • Uses widgets in a fairly straight forward design
      • @@ -33,6 +34,7 @@
        +
      • Documentation Link
      • Supports: Linux and other unix-like OS
      • Part of the standard library
      • Extensive how-to guide
        • @@ -47,6 +49,7 @@
          +
        • Documentation Link
        • Supports: Linux, Mac, and Windows
        • Sits on top of curses to add more pythonic bindings
        • Doesn't provide any widgets or layouts
          • @@ -60,6 +63,7 @@
          @@ -86,6 +92,19 @@ asciimatics
          +

          Python Prompt Toolkit

          +
          +
          + +
          +
          + python prompt toolkit +
          +
          {% endblock %} -- cgit v1.2.3 From 297337fa6552ec32d95e82dc41c018ef1a5e3cf3 Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Wed, 16 Jun 2021 06:22:40 +0100 Subject: Add cache purge step to CI deploy stage (#533) --- .github/workflows/deploy.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index efc08040..4208f727 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -44,3 +44,9 @@ jobs: site/deployment.yaml images: 'ghcr.io/python-discord/site:${{ steps.sha_tag.outputs.tag }}' kubectl-version: 'latest' + + - name: Purge Cloudflare Edge Cache + uses: jakejarvis/cloudflare-purge-action@master + env: + CLOUDFLARE_ZONE: 989c984a358bfcd1e9b9d188cc86c1df + CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_CACHE_TOKEN }} -- cgit v1.2.3 From a8a0322c871ef04920167ded706cfdc8a425d958 Mon Sep 17 00:00:00 2001 From: bast Date: Fri, 18 Jun 2021 13:46:06 -0700 Subject: Adjust Message model to support new nitro messages with over 4000 chars --- .../apps/api/migrations/0070_auto_20210618_2010.py | 18 ++++++++++ pydis_site/apps/api/models/bot/message.py | 2 +- pydis_site/apps/api/tests/test_models.py | 40 +++++++++++++++++++++- 3 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 pydis_site/apps/api/migrations/0070_auto_20210618_2010.py diff --git a/pydis_site/apps/api/migrations/0070_auto_20210618_2010.py b/pydis_site/apps/api/migrations/0070_auto_20210618_2010.py new file mode 100644 index 00000000..b0c79b32 --- /dev/null +++ b/pydis_site/apps/api/migrations/0070_auto_20210618_2010.py @@ -0,0 +1,18 @@ +# Generated by Django 3.0.14 on 2021-06-18 20:10 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('api', '0069_documentationlink_validators'), + ] + + operations = [ + migrations.AlterField( + model_name='deletedmessage', + name='content', + field=models.CharField(blank=True, help_text='The content of this message, taken from Discord.', max_length=4000), + ), + ] diff --git a/pydis_site/apps/api/models/bot/message.py b/pydis_site/apps/api/models/bot/message.py index ff06de21..60e2a553 100644 --- a/pydis_site/apps/api/models/bot/message.py +++ b/pydis_site/apps/api/models/bot/message.py @@ -43,7 +43,7 @@ class Message(ModelReprMixin, models.Model): verbose_name="Channel ID" ) content = models.CharField( - max_length=2_000, + max_length=4_000, help_text="The content of this message, taken from Discord.", blank=True ) diff --git a/pydis_site/apps/api/tests/test_models.py b/pydis_site/apps/api/tests/test_models.py index 66052e01..1303639e 100644 --- a/pydis_site/apps/api/tests/test_models.py +++ b/pydis_site/apps/api/tests/test_models.py @@ -1,6 +1,7 @@ from datetime import datetime as dt -from django.test import SimpleTestCase +from django.core.exceptions import ValidationError +from django.test import SimpleTestCase, TestCase from django.utils import timezone from pydis_site.apps.api.models import ( @@ -34,6 +35,43 @@ class ReprMixinTests(SimpleTestCase): self.assertEqual(repr(self.klass), expected) +class NitroMessageLengthTest(TestCase): + def setUp(self): + self.user = User.objects.create(id=50, name='bill', discriminator=5) + self.context = MessageDeletionContext.objects.create( + id=50, + actor=self.user, + creation=dt.utcnow() + ) + + def test_create(self): + message = DeletedMessage( + id=46, + author=self.user, + channel_id=666, + content="w"*4000, + deletion_context=self.context, + embeds=[] + ) + + try: + message.clean_fields() + except Exception as e: + self.fail(f"Creation of message of length 3950 failed with: {e}") + + def test_create_failure(self): + message = DeletedMessage( + id=47, + author=self.user, + channel_id=666, + content="w"*4001, + deletion_context=self.context, + embeds=[] + ) + + self.assertRaisesRegex(ValidationError, "content':", message.clean_fields) + + class StringDunderMethodTests(SimpleTestCase): def setUp(self): self.nomination = Nomination( -- cgit v1.2.3 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 @@

        Important Dates

        • 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

          +

          + 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.
            • +
          +

          How to Join

          -

          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! +

          Sign up for the Code Jam
          +

          + {% 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 @@ JetBrains + + Tabnine +
        -- 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!
        Sign up for the Code Jam

        +

        Prizes

        +

        + 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. +

        + +
        +
        +
        +
        + Digital Ocean +
        +
        +

        DigitalOcean

        +

        + Scalable compute platform with add-on storage, security, and monitoring capabilities. + 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.

        +
        +
        +
        +
        + +
        +
        +
        +
        + JetBrains +
        +
        +

        JetBrains

        +

        + Whatever platform or language you work with, JetBrains has a development tool for you. + We help developers work faster by automating common, repetitive tasks to enable them to stay focused on code design and the big picture. + 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.

        +
        +
        +
        +
        +
        +
        +
        +
        + Tabnine +
        +
        +

        Tabnine

        +

        Tabnine is an AI-powered code completion tool used by millions of devs around the world every day + - Tabnine supports dozens of programming languages, in all of your favorite IDEs, saving you tons of time - so that you can type less and code more. + 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.

        +
        +
        +
        +
        {% endblock %} -- cgit v1.2.3 From d2112a84259c18db2d2a93b3821a8668edc23ada Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Mon, 21 Jun 2021 00:48:27 +0100 Subject: Update navbar hamburger/dropdown anchors to spans There is no href on these items, so they should not be anchors. --- pydis_site/templates/base/navbar.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pydis_site/templates/base/navbar.html b/pydis_site/templates/base/navbar.html index ee458b03..d7cb49b2 100644 --- a/pydis_site/templates/base/navbar.html +++ b/pydis_site/templates/base/navbar.html @@ -57,12 +57,12 @@ {# More #}
        - + More - - + + More - +
        Resources -- 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 @@

        Important Dates

        • 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! -

            Sign up for the Code Jam
            +
            Sign up for the Code Jam

            Prizes

            -- 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 From 05730b3c55811ec2b9c7c0ff8484714a3ee498b2 Mon Sep 17 00:00:00 2001 From: bast Date: Thu, 24 Jun 2021 07:34:59 -0700 Subject: Add pragma: no cover to mark failure condition of test as known ok --- pydis_site/apps/api/tests/test_models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pydis_site/apps/api/tests/test_models.py b/pydis_site/apps/api/tests/test_models.py index 1303639e..5c9ddea4 100644 --- a/pydis_site/apps/api/tests/test_models.py +++ b/pydis_site/apps/api/tests/test_models.py @@ -56,7 +56,7 @@ class NitroMessageLengthTest(TestCase): try: message.clean_fields() - except Exception as e: + except Exception as e: # pragma: no cover self.fail(f"Creation of message of length 3950 failed with: {e}") def test_create_failure(self): -- cgit v1.2.3 From 6c9c7f078d2d677f4e377264e2741fd02a228cab Mon Sep 17 00:00:00 2001 From: bast Date: Thu, 24 Jun 2021 07:46:14 -0700 Subject: Recreate nitro message length migration and name it --- .../apps/api/migrations/0070_auto_20210618_2010.py | 18 ------------------ .../migrations/0071_increase_message_content_4000.py | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 pydis_site/apps/api/migrations/0070_auto_20210618_2010.py create mode 100644 pydis_site/apps/api/migrations/0071_increase_message_content_4000.py diff --git a/pydis_site/apps/api/migrations/0070_auto_20210618_2010.py b/pydis_site/apps/api/migrations/0070_auto_20210618_2010.py deleted file mode 100644 index b0c79b32..00000000 --- a/pydis_site/apps/api/migrations/0070_auto_20210618_2010.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.14 on 2021-06-18 20:10 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('api', '0069_documentationlink_validators'), - ] - - operations = [ - migrations.AlterField( - model_name='deletedmessage', - name='content', - field=models.CharField(blank=True, help_text='The content of this message, taken from Discord.', max_length=4000), - ), - ] diff --git a/pydis_site/apps/api/migrations/0071_increase_message_content_4000.py b/pydis_site/apps/api/migrations/0071_increase_message_content_4000.py new file mode 100644 index 00000000..6ca5d21a --- /dev/null +++ b/pydis_site/apps/api/migrations/0071_increase_message_content_4000.py @@ -0,0 +1,18 @@ +# Generated by Django 3.0.14 on 2021-06-24 14:45 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('api', '0070_auto_20210618_2114'), + ] + + operations = [ + migrations.AlterField( + model_name='deletedmessage', + name='content', + field=models.CharField(blank=True, help_text='The content of this message, taken from Discord.', max_length=4000), + ), + ] -- cgit v1.2.3