Merge branch 'main' into subdomains-to-query-paths

Author: jb3

Dockerfile

@@ -24,6 +24,13 @@ ENV GIT_SHA=$git_sha
 # Copy the source code in last to optimize rebuilding the image
 COPY . .
 
+# Set dummy variables so collectstatic can load settings.py
+RUN \
+    SECRET_KEY=dummy_value \
+    DATABASE_URL=postgres://localhost \
+    METRICITY_DB_URL=postgres://localhost \
+    python manage.py collectstatic --noinput --clear
+
 # Run web server through custom manager
 ENTRYPOINT ["python", "manage.py"]
 CMD ["run"]

README.md

@@ -12,7 +12,7 @@ This is all of the code that is responsible for maintaining [our website][9] and
 The website is built on Django and should be simple to set up and get started with.
 If you happen to run into issues with setup, please don't hesitate to open an issue!
 
-If you're looking to contribute or play around with the code, take a look at [the wiki][10] or the [`docs` directory](docs). If you're looking for things to do, check out [our issues][11].
+If you're looking to contribute or play around with the code, take a look at [the wiki][10]. If you're looking for things to do, check out [our issues][11].
 
 [1]: https://github.com/python-discord/site/workflows/Lint%20&%20Test/badge.svg?branch=main
 [2]: https://github.com/python-discord/site/actions?query=workflow%3A%22Lint+%26+Test%22+branch%3Amain

manage.py

@@ -138,10 +138,17 @@ def prepare_server(self) -> None:
 
         print("Applying migrations.")
         call_command("migrate", verbosity=self.verbosity)
-        print("Collecting static files.")
-        call_command("collectstatic", interactive=False, clear=True, verbosity=self.verbosity)
 
         if self.debug:
+            # In Production, collectstatic is ran in the Docker image
+            print("Collecting static files.")
+            call_command(
+                "collectstatic",
+                interactive=False,
+                clear=True,
+                verbosity=self.verbosity - 1
+            )
+
             self.set_dev_site_name()
             self.create_superuser()
 

pydis_site/apps/content/resources/guides/pydis-guides/contributing/sir-lancebot.md

@@ -97,7 +97,7 @@ The first time you run this command, it may take a few minutes while Docker down
 $ docker-compose up
 ```
 
-If you get any Docker related errors, reference the [Possible Issues](./docker/possible-issues) section of the Docker page.
+If you get any Docker related errors, reference the [Possible Issues](../docker#possible-issues) section of the Docker page.
 {: .notification .is-warning }
 
 ## Run on the host

pydis_site/apps/content/resources/guides/pydis-guides/contributing/sir-lancebot/env-var-reference.md

@@ -32,7 +32,7 @@ Additionally, you may find the following environment variables useful during dev
 | `REDIS_PASSWORD` | |
 | `USE_FAKEREDIS` | If the FakeRedis module should be used. Set this to true if you don't have a Redis database setup. |
 | `BOT_SENTRY_DSN` | The DSN of the sentry monitor. |
-| `TRASHCAN_EMOJI` | The emoji to use for the trashcan during paginated embeds |
+| `TRASHCAN_EMOJI` | The full emoji to use for the trashcan. Format should be like the output of `\:emoji:`. |
 
 
 ---

pydis_site/apps/home/views/home.py

@@ -19,7 +19,6 @@ class HomeView(View):
 
     github_api = "https://api.github.com/users/python-discord/repos?per_page=100"
     repository_cache_ttl = 3600
-    headers = {"Authorization": f"token {GITHUB_TOKEN}"}
 
     # Which of our GitHub repos should be displayed on the front page, and in which order?
     repos = [
@@ -35,6 +34,16 @@ def __init__(self):
         """Clean up stale RepositoryMetadata."""
         RepositoryMetadata.objects.exclude(repo_name__in=self.repos).delete()
 
+        # If no token is defined (for example in local development), then
+        # it does not make sense to pass the Authorization header. More
+        # specifically, GitHub will reject any requests from us due to the
+        # invalid header. We can make a limited number of anonymous requests
+        # though, which is useful for testing.
+        if GITHUB_TOKEN:
+            self.headers = {"Authorization": f"token {GITHUB_TOKEN}"}
+        else:
+            self.headers = {}
+
     def _get_api_data(self) -> Dict[str, Dict[str, str]]:
         """
         Call the GitHub API and get information about our repos.
@@ -74,58 +83,52 @@ def _get_api_data(self) -> Dict[str, Dict[str, str]]:
 
     def _get_repo_data(self) -> List[RepositoryMetadata]:
         """Build a list of RepositoryMetadata objects that we can use to populate the front page."""
-        database_repositories = []
-
-        # First, let's see if we have any metadata cached.
-        cached_data = RepositoryMetadata.objects.all()
+        # First off, load the timestamp of the least recently updated entry.
+        last_update = (
+            RepositoryMetadata.objects.values_list("last_updated", flat=True)
+            .order_by("last_updated").first()
+        )
 
-        # If we don't, we have to create some!
-        if not cached_data:
+        # If we did not retrieve any results here, we should import them!
+        if last_update is None:
 
             # Try to get new data from the API. If it fails, we'll return an empty list.
             # In this case, we simply don't display our projects on the site.
             api_repositories = self._get_api_data()
 
             # Create all the repodata records in the database.
-            for api_data in api_repositories.values():
-                repo_data = RepositoryMetadata(
+            return RepositoryMetadata.objects.bulk_create(
+                RepositoryMetadata(
                     repo_name=api_data["full_name"],
                     description=api_data["description"],
                     forks=api_data["forks_count"],
                     stargazers=api_data["stargazers_count"],
                     language=api_data["language"],
                 )
-
-                repo_data.save()
-                database_repositories.append(repo_data)
-
-            return database_repositories
+                for api_data in api_repositories.values()
+            )
 
         # If the data is stale, we should refresh it.
-        if (timezone.now() - cached_data[0].last_updated).seconds > self.repository_cache_ttl:
+        if (timezone.now() - last_update).seconds > self.repository_cache_ttl:
             # Try to get new data from the API. If it fails, return the cached data.
             api_repositories = self._get_api_data()
 
             if not api_repositories:
                 return RepositoryMetadata.objects.all()
 
             # Update or create all RepoData objects in self.repos
-            for repo_name, api_data in api_repositories.items():
-                try:
-                    repo_data = RepositoryMetadata.objects.get(repo_name=repo_name)
-                    repo_data.description = api_data["description"]
-                    repo_data.language = api_data["language"]
-                    repo_data.forks = api_data["forks_count"]
-                    repo_data.stargazers = api_data["stargazers_count"]
-                except RepositoryMetadata.DoesNotExist:
-                    repo_data = RepositoryMetadata(
-                        repo_name=api_data["full_name"],
-                        description=api_data["description"],
-                        forks=api_data["forks_count"],
-                        stargazers=api_data["stargazers_count"],
-                        language=api_data["language"],
-                    )
-                repo_data.save()
+            database_repositories = []
+            for api_data in api_repositories.values():
+                repo_data, _created = RepositoryMetadata.objects.update_or_create(
+                    repo_name=api_data["full_name"],
+                    defaults={
+                        'repo_name': api_data["full_name"],
+                        'description': api_data["description"],
+                        'forks': api_data["forks_count"],
+                        'stargazers': api_data["stargazers_count"],
+                        'language': api_data["language"],
+                    }
+                )
                 database_repositories.append(repo_data)
             return database_repositories
 

pydis_site/apps/resources/resources/tools/ides/repl_it.yaml renamed to pydis_site/apps/resources/resources/tools/ides/replit.yaml

@@ -1,5 +1,5 @@
 description: A free, collaborative, in-browser IDE to code in 50+ languages —
   without spending a second on setup.
-name: repl.it
-title_url: https://repl.it/
+name: replit
+title_url: https://replit.com/
 position: 3

pydis_site/templates/events/index.html

@@ -121,6 +121,6 @@ <h2 class="title is-4">PyWeek</h2>
 {% endblock %}
 
 {% block sidebar %}
-    {% include "events/sidebar/upcoming-event.html" %}
+    {% include "events/sidebar/ongoing-event.html" %}
     {% include "events/sidebar/events-list.html" %}
 {% endblock %}

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

@@ -12,12 +12,12 @@
 
 {% block event_content %}
     <p>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.
+        in a team with 5 other random server members. You then have 8 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.
     </p>
     <p>
-        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.
+        After the 8 days is complete, your team has 3 days to finish documentation and create a video presentation showcasing
+        and walking through the program that your team has created.
     </p>
 
     <h3 id="important-dates"><a href="#important-dates">Important Dates</a></h3>
@@ -26,10 +26,10 @@ <h3 id="important-dates"><a href="#important-dates">Important Dates</a></h3>
         <li>Monday, June 21 - <a href="https://github.com/python-discord/cj8-qualifier">The Qualifier</a> is released</li>
         <li>Friday, June 25 - Voting for the theme opens</li>
         <li>Saturday, June 26 @ 4PM UTC- <a class="has-text-link" href="{% url "events:page" path="code-jams/8/github-bootcamp" %}">GitHub Bootcamp</a></li>
-        <li>Wednesday, June 30 - The Qualifier closes</li>
-        <li>Friday, July 9 - Code Jam begins</li>
-        <li>Friday, July 16 - Coding portion of the jam ends</li>
-        <li>Sunday, July 18 - Code Jam submissions are closed</li>
+        <li>Wednesday, July 1 - The Qualifier closes</li>
+        <li>Friday, July 9 @ 5PM UTC - Code Jam begins and the theme is announced</li>
+        <li>Saturday, July 17 @ 5PM UTC - Coding portion of the jam ends</li>
+        <li>Tuesday, July 20 - Code Jam submissions are closed and video presentation must be submitted</li>
     </ul>
 
     <h3 id="technology"><a href="#technology">Technology</a></h3>
@@ -52,11 +52,10 @@ <h3 if="qualifier"><a href="#qualifier">The Qualifier</a></h3>
             <li>The Qualifier must be submitted through the Code Jam sign-up form.</li>
         </ul>
     </p>
-    <h3 id="how-to-join"><a href="#how-to-join">How to Join</a></h3>
+    <h3 id="submissions"><a href="#submissions">Submissions</a></h3>
     <p>
-        To enter into the code jam you must complete <a href="#qualifier">The Qualifier</a> and submit the sign-up form.
-        Don't forget to join us on Discord at <a href="https://discord.gg/python">discord.gg/python</a>!
-        <div class="has-text-centered"><a class="button is-link" href="https://form.jotform.com/211714357615050" target="_blank">Sign up for the Code Jam</a></div>
+        63 teams started out on July 9th 2021. By the end of the jam, 51 teams made project submissions. Check them all out here:
+        <div class="has-text-centered"><a class="button is-link" href="submissions">View Submissions</a></div>
     </p>
     <h3 id="prizes"><a href="#prizes">Prizes</a></h3>
     <p>

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

@@ -73,6 +73,11 @@ <h3 id="rich"><a href="#rich">Rich</a></h3>
                 <li><strong>Supports:</strong> Linux, Mac, and Windows</li>
                 <li>Documentation is good and overall is very OOP focused</li>
                 <li>Robust with many features and example snippets</li>
+                <li>To supplement Rich the following library is approved, although no guarantees are made for stability.</li>
+                <ul>
+                    <li><a href="https://github.com/willmcgugan/textual" target="_blank">Textual</a> - a TUI framework using Rich as the render.
+                        <br>It is still under active development, is only available on Mac/Linux, and is not stable yet.</li>
+                </ul>
             </ul>
         </div>
         <div class="column">