Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Dockerfile
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
# syntax = docker/dockerfile:1.4
FROM python:3.10 AS compile-stage
FROM python:3.13.0a4-slim AS compile-stage

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
FROM python:3.13.0a4-slim AS compile-stage
FROM python:3.12-slim AS compile-stage

RUN --mount=type=cache,target=/var/cache/apt \
apt update && \
apt install -y --no-install-recommends \

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should to add libraries for the compilation of Pillow 9.5 for Python 3.12

 RUN --mount=type=cache,target=/var/cache/apt \
apt update && \
apt install -y --no-install-recommends \
build-essential gcc neovim fish less iputils-ping postgresql-client \
+ zlib1g-dev libjpeg-dev libraqm-dev libimagequant-dev libtiff-dev \+ libfreetype6-dev liblcms2-dev libwebp-dev libharfbuzz-dev libfribidi-dev \+ libtiff5-dev \+ libwebp-dev \
ack

without these libs, I can't compile the Docker image

Expand All@@ -19,3 +19,4 @@ RUN --mount=type=cache,target=/root/.cache \

FROM compile-stage AS tests-stage

USER nobody
2 changes: 1 addition & 1 deletion Taskfile.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,7 @@ tasks:
- docker compose run --rm web python pythonie/manage.py migrate

django:collect-static:
desc: Make migrations
desc: Make static resources
cmds:
- docker compose run --rm web python pythonie/manage.py collectstatic

Expand Down
8 changes: 6 additions & 2 deletions pythonie/core/templates/base.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,8 @@
<meta name="description" content=""/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>

<script type="text/javascript" src="//use.typekit.net/qgj1xay.js"></script>
<script type="text/javascript" src="//use.typekit.net/qgj1xay.js"
integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"></script>
<script type="text/javascript">try{Typekit.load({async: false});}catch(e){}</script>


Expand DownExpand Up@@ -56,7 +57,10 @@
{% endcompress %}

{% block basejs %}
<script src="https://code.jquery.com/jquery.js"></script>
<script src="https://code.jquery.com/jquery-1.12.4.js"
integrity="sha256-Qw82+bXyGq6MydymqBxNPYTaUXXq7c8v3CwiYwLLNXU="
crossorigin="anonymous"></script>

<script src="{% static 'js/jquery.smartmenus.js' %}"></script>
<script src="{% static 'js/jquery.smartmenus.bootstrap.js' %}"></script>
<script src="{% static 'js/bootstrap.min.js' %}"></script>
Expand Down
10 changes: 5 additions & 5 deletions pythonie/meetups/test_meetups.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,9 @@
description = (
"<p>We will be having a meetup in June. More details to follow."
"</p> <p>If you are interested in speaking, please submit your "
'details to\xa0<a href="http://bit.ly/pyie-cfp-2015">'
'<a href="http://bit.ly/pyie-cfp-2015" class="linkified">'
"http://bit.ly/pyie-cfp-2015</a></a>.</p> <p>Enquiries? Please "
'details to\xa0<a href="https://bit.ly/pyie-cfp-2015">'
'<a href="https://bit.ly/pyie-cfp-2015" class="linkified">'
"https://bit.ly/pyie-cfp-2015</a></a>.</p> <p>Enquiries? Please "
"contact contact@python.ie.</p>"
)

Expand DownExpand Up@@ -60,7 +60,7 @@ def _first_result(self):
"description": description,
"name": "Python Ireland meetup",
"event_url": (
"http://www.meetup.com/pythonireland/" "events/221078098/"
"https://www.meetup.com/pythonireland/" "events/221078098/"
),
"headcount": 0,
"time": 1433957400000,
Expand DownExpand Up@@ -123,7 +123,7 @@ def test_update_first_run(self, mock_get_content):
self.assertEqual(meetup.visibility, "public")
self.assertEqual(
meetup.event_url,
("http://www.meetup.com/" "pythonireland/events/221078098/"),
("https://www.meetup.com/" "pythonireland/events/221078098/"),
)

@patch("meetups.utils.get_content")
Expand Down
2 changes: 1 addition & 1 deletion pythonie/pythonie/settings/dev.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@

DEBUG = True

SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" # Just for dev
SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" # just for dev #nosec B105
MEETUP_KEY = "" # Put your own key here.
# See https://secure.meetup.com/meetup_api/key/

Expand Down
2 changes: 1 addition & 1 deletion pythonie/pythonie/settings/tests.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@

DEBUG = True

SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" # Just for dev
SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" #nosec B105 # Just for dev
MEETUP_KEY = "" # Put your own key here.
# See https://secure.meetup.com/meetup_api/key/

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
import numpy as np
import pandas as pd
from django.core.management.base import BaseCommand, CommandParser
from django.utils.text import slugify
from wagtail.core.models import Page

from speakers.models import Speaker, Room, Session
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ class SessionizeModel(pydantic.BaseModel):

class Command(BaseCommand):
def handle(self, *args, **kwargs):
response = requests.get("https://sessionize.com/api/v2/z66z4kb6/view/All")
response = requests.get("https://sessionize.com/api/v2/z66z4kb6/view/All", timeout=500)
sessionize: SessionizeModel = SessionizeModel.parse_obj(response.json())

rooms = {}
Expand Down
2 changes: 1 addition & 1 deletion pythonie/speakers/templates/speakers/session.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ <h2>{{ self.name }}</h2>
<a href="{% pageurl speaker %}">{{ speaker.name }}</a>
</td>
<td>
{{ speaker.biography|safe }}
{{ speaker.biography }}
</td>
</tr>
{% endfor %}
Expand Down
6 changes: 4 additions & 2 deletions requirements/dev.in
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
# dev.in
-c main.txt
bandit
black
coverage
django-debug-toolbar
fakeredis
flake8
isort
model-mommy
pipdeptree
django-debug-toolbar
pip-tools
pipdeptree
126 changes: 90 additions & 36 deletions requirements/dev.txt
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,116 @@
asgiref==3.6.0
#
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# pip-compile dev.in
#
asgiref==3.8.1
# via
# -c requirements/main.txt
# -c main.txt
# django
async-timeout==4.0.2
async-timeout==4.0.3
# via
# -c requirements/main.txt
# -c main.txt
# redis
black==23.3.0
# via -r requirements/dev.in
click==8.1.3
# via black
coverage==7.2.2
# via -r requirements/dev.in
django==3.2.18
bandit==1.7.8
# via -r dev.in
black==24.3.0
# via -r dev.in
build==1.1.1
# via pip-tools
click==8.1.7
# via
# black
# pip-tools
coverage==7.4.4
# via -r dev.in
django==3.2.25
# via
# -c requirements/main.txt
# -c main.txt
# django-debug-toolbar
# model-mommy
django-debug-toolbar==3.8.1
# via -r requirements/dev.in
fakeredis==2.10.2
# via -r requirements/dev.in
flake8==6.0.0
# via -r requirements/dev.in
isort==5.12.0
# via -r requirements/dev.in
django-debug-toolbar==4.3.0
# via -r dev.in
fakeredis==2.21.3
# via -r dev.in
flake8==7.0.0
# via -r dev.in
importlib-metadata==7.1.0
# via build
isort==5.13.2
# via -r dev.in
markdown-it-py==3.0.0
# via rich
mccabe==0.7.0
# via flake8
mdurl==0.1.2
# via markdown-it-py
model-mommy==2.0.0
# via -r requirements/dev.in
# via -r dev.in
mypy-extensions==1.0.0
# via black
packaging==23.0
# via black
pathspec==0.11.1
packaging==24.0
# via
# -c main.txt
# black
# build
pathspec==0.12.1
# via black
pipdeptree==2.7.0
# via -r requirements/dev.in
platformdirs==3.2.0
pbr==6.0.0
# via stevedore
pip-tools==7.4.1
# via -r dev.in
pipdeptree==2.16.1
# via -r dev.in
platformdirs==4.2.0
# via black
pycodestyle==2.10.0
pycodestyle==2.11.1
# via flake8
pyflakes==3.0.1
pyflakes==3.2.0
# via flake8
pytz==2023.3
pygments==2.17.2
# via rich
pyproject-hooks==1.0.0
# via
# -c requirements/main.txt
# build
# pip-tools
pytz==2024.1
# via
# -c main.txt
# django
redis==4.5.4
pyyaml==6.0.1
# via bandit
redis==5.0.3
# via
# -c requirements/main.txt
# -c main.txt
# fakeredis
rich==13.7.1
# via bandit
sortedcontainers==2.4.0
# via fakeredis
sqlparse==0.4.3
sqlparse==0.4.4
# via
# -c requirements/main.txt
# -c main.txt
# django
# django-debug-toolbar
stevedore==5.2.0
# via bandit
tomli==2.0.1
# via black
# via
# black
# build
# pip-tools
# pyproject-hooks
typing-extensions==4.10.0
# via
# -c main.txt
# asgiref
# black
wheel==0.43.0
# via pip-tools
zipp==3.18.1
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
# setuptools
5 changes: 3 additions & 2 deletions requirements/main.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,15 +13,16 @@ django-libsass
django-modelcluster
django-storages
django-taggit
gunicorn
gunicorn>=22.0.0
pandas
pydantic
python-dateutil
pytz
redis
requests
wagtail
wagtail-blog
# important to pin that version until that dependency is removed
wagtail-blog==2.3.5
wagtailfontawesome
wagtailnews
whitenoise
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Dockerfile
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
# syntax = docker/dockerfile:1.4
FROM python:3.10 AS compile-stage
FROM python:3.13.0a4-slim AS compile-stage

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
FROM python:3.13.0a4-slim AS compile-stage
FROM python:3.12-slim AS compile-stage

RUN --mount=type=cache,target=/var/cache/apt \
apt update && \
apt install -y --no-install-recommends \

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should to add libraries for the compilation of Pillow 9.5 for Python 3.12

 RUN --mount=type=cache,target=/var/cache/apt \
apt update && \
apt install -y --no-install-recommends \
build-essential gcc neovim fish less iputils-ping postgresql-client \
+ zlib1g-dev libjpeg-dev libraqm-dev libimagequant-dev libtiff-dev \+ libfreetype6-dev liblcms2-dev libwebp-dev libharfbuzz-dev libfribidi-dev \+ libtiff5-dev \+ libwebp-dev \
ack

without these libs, I can't compile the Docker image

Expand All@@ -19,3 +19,4 @@ RUN --mount=type=cache,target=/root/.cache \

FROM compile-stage AS tests-stage

USER nobody
2 changes: 1 addition & 1 deletion Taskfile.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,7 @@ tasks:
- docker compose run --rm web python pythonie/manage.py migrate

django:collect-static:
desc: Make migrations
desc: Make static resources
cmds:
- docker compose run --rm web python pythonie/manage.py collectstatic

Expand Down
8 changes: 6 additions & 2 deletions pythonie/core/templates/base.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,8 @@
<meta name="description" content=""/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>

<script type="text/javascript" src="//use.typekit.net/qgj1xay.js"></script>
<script type="text/javascript" src="//use.typekit.net/qgj1xay.js"
integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"></script>
<script type="text/javascript">try{Typekit.load({async: false});}catch(e){}</script>


Expand DownExpand Up@@ -56,7 +57,10 @@
{% endcompress %}

{% block basejs %}
<script src="https://code.jquery.com/jquery.js"></script>
<script src="https://code.jquery.com/jquery-1.12.4.js"
integrity="sha256-Qw82+bXyGq6MydymqBxNPYTaUXXq7c8v3CwiYwLLNXU="
crossorigin="anonymous"></script>

<script src="{% static 'js/jquery.smartmenus.js' %}"></script>
<script src="{% static 'js/jquery.smartmenus.bootstrap.js' %}"></script>
<script src="{% static 'js/bootstrap.min.js' %}"></script>
Expand Down
10 changes: 5 additions & 5 deletions pythonie/meetups/test_meetups.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,9 @@
description = (
"<p>We will be having a meetup in June. More details to follow."
"</p> <p>If you are interested in speaking, please submit your "
'details to\xa0<a href="http://bit.ly/pyie-cfp-2015">'
'<a href="http://bit.ly/pyie-cfp-2015" class="linkified">'
"http://bit.ly/pyie-cfp-2015</a></a>.</p> <p>Enquiries? Please "
'details to\xa0<a href="https://bit.ly/pyie-cfp-2015">'
'<a href="https://bit.ly/pyie-cfp-2015" class="linkified">'
"https://bit.ly/pyie-cfp-2015</a></a>.</p> <p>Enquiries? Please "
"contact contact@python.ie.</p>"
)

Expand DownExpand Up@@ -60,7 +60,7 @@ def _first_result(self):
"description": description,
"name": "Python Ireland meetup",
"event_url": (
"http://www.meetup.com/pythonireland/" "events/221078098/"
"https://www.meetup.com/pythonireland/" "events/221078098/"
),
"headcount": 0,
"time": 1433957400000,
Expand DownExpand Up@@ -123,7 +123,7 @@ def test_update_first_run(self, mock_get_content):
self.assertEqual(meetup.visibility, "public")
self.assertEqual(
meetup.event_url,
("http://www.meetup.com/" "pythonireland/events/221078098/"),
("https://www.meetup.com/" "pythonireland/events/221078098/"),
)

@patch("meetups.utils.get_content")
Expand Down
2 changes: 1 addition & 1 deletion pythonie/pythonie/settings/dev.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@

DEBUG = True

SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" # Just for dev
SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" # just for dev #nosec B105
MEETUP_KEY = "" # Put your own key here.
# See https://secure.meetup.com/meetup_api/key/

Expand Down
2 changes: 1 addition & 1 deletion pythonie/pythonie/settings/tests.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@

DEBUG = True

SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" # Just for dev
SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" #nosec B105 # Just for dev
MEETUP_KEY = "" # Put your own key here.
# See https://secure.meetup.com/meetup_api/key/

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
import numpy as np
import pandas as pd
from django.core.management.base import BaseCommand, CommandParser
from django.utils.text import slugify
from wagtail.core.models import Page

from speakers.models import Speaker, Room, Session
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ class SessionizeModel(pydantic.BaseModel):

class Command(BaseCommand):
def handle(self, *args, **kwargs):
response = requests.get("https://sessionize.com/api/v2/z66z4kb6/view/All")
response = requests.get("https://sessionize.com/api/v2/z66z4kb6/view/All", timeout=500)
sessionize: SessionizeModel = SessionizeModel.parse_obj(response.json())

rooms = {}
Expand Down
2 changes: 1 addition & 1 deletion pythonie/speakers/templates/speakers/session.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ <h2>{{ self.name }}</h2>
<a href="{% pageurl speaker %}">{{ speaker.name }}</a>
</td>
<td>
{{ speaker.biography|safe }}
{{ speaker.biography }}
</td>
</tr>
{% endfor %}
Expand Down
6 changes: 4 additions & 2 deletions requirements/dev.in
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
# dev.in
-c main.txt
bandit
black
coverage
django-debug-toolbar
fakeredis
flake8
isort
model-mommy
pipdeptree
django-debug-toolbar
pip-tools
pipdeptree
126 changes: 90 additions & 36 deletions requirements/dev.txt
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,116 @@
asgiref==3.6.0
#
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# pip-compile dev.in
#
asgiref==3.8.1
# via
# -c requirements/main.txt
# -c main.txt
# django
async-timeout==4.0.2
async-timeout==4.0.3
# via
# -c requirements/main.txt
# -c main.txt
# redis
black==23.3.0
# via -r requirements/dev.in
click==8.1.3
# via black
coverage==7.2.2
# via -r requirements/dev.in
django==3.2.18
bandit==1.7.8
# via -r dev.in
black==24.3.0
# via -r dev.in
build==1.1.1
# via pip-tools
click==8.1.7
# via
# black
# pip-tools
coverage==7.4.4
# via -r dev.in
django==3.2.25
# via
# -c requirements/main.txt
# -c main.txt
# django-debug-toolbar
# model-mommy
django-debug-toolbar==3.8.1
# via -r requirements/dev.in
fakeredis==2.10.2
# via -r requirements/dev.in
flake8==6.0.0
# via -r requirements/dev.in
isort==5.12.0
# via -r requirements/dev.in
django-debug-toolbar==4.3.0
# via -r dev.in
fakeredis==2.21.3
# via -r dev.in
flake8==7.0.0
# via -r dev.in
importlib-metadata==7.1.0
# via build
isort==5.13.2
# via -r dev.in
markdown-it-py==3.0.0
# via rich
mccabe==0.7.0
# via flake8
mdurl==0.1.2
# via markdown-it-py
model-mommy==2.0.0
# via -r requirements/dev.in
# via -r dev.in
mypy-extensions==1.0.0
# via black
packaging==23.0
# via black
pathspec==0.11.1
packaging==24.0
# via
# -c main.txt
# black
# build
pathspec==0.12.1
# via black
pipdeptree==2.7.0
# via -r requirements/dev.in
platformdirs==3.2.0
pbr==6.0.0
# via stevedore
pip-tools==7.4.1
# via -r dev.in
pipdeptree==2.16.1
# via -r dev.in
platformdirs==4.2.0
# via black
pycodestyle==2.10.0
pycodestyle==2.11.1
# via flake8
pyflakes==3.0.1
pyflakes==3.2.0
# via flake8
pytz==2023.3
pygments==2.17.2
# via rich
pyproject-hooks==1.0.0
# via
# -c requirements/main.txt
# build
# pip-tools
pytz==2024.1
# via
# -c main.txt
# django
redis==4.5.4
pyyaml==6.0.1
# via bandit
redis==5.0.3
# via
# -c requirements/main.txt
# -c main.txt
# fakeredis
rich==13.7.1
# via bandit
sortedcontainers==2.4.0
# via fakeredis
sqlparse==0.4.3
sqlparse==0.4.4
# via
# -c requirements/main.txt
# -c main.txt
# django
# django-debug-toolbar
stevedore==5.2.0
# via bandit
tomli==2.0.1
# via black
# via
# black
# build
# pip-tools
# pyproject-hooks
typing-extensions==4.10.0
# via
# -c main.txt
# asgiref
# black
wheel==0.43.0
# via pip-tools
zipp==3.18.1
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
# setuptools
5 changes: 3 additions & 2 deletions requirements/main.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,15 +13,16 @@ django-libsass
django-modelcluster
django-storages
django-taggit
gunicorn
gunicorn>=22.0.0
pandas
pydantic
python-dateutil
pytz
redis
requests
wagtail
wagtail-blog
# important to pin that version until that dependency is removed
wagtail-blog==2.3.5
wagtailfontawesome
wagtailnews
whitenoise
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Dockerfile
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
# syntax = docker/dockerfile:1.4
FROM python:3.10 AS compile-stage
FROM python:3.13.0a4-slim AS compile-stage

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
FROM python:3.13.0a4-slim AS compile-stage
FROM python:3.12-slim AS compile-stage

RUN --mount=type=cache,target=/var/cache/apt \
apt update && \
apt install -y --no-install-recommends \

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should to add libraries for the compilation of Pillow 9.5 for Python 3.12

 RUN --mount=type=cache,target=/var/cache/apt \
apt update && \
apt install -y --no-install-recommends \
build-essential gcc neovim fish less iputils-ping postgresql-client \
+ zlib1g-dev libjpeg-dev libraqm-dev libimagequant-dev libtiff-dev \+ libfreetype6-dev liblcms2-dev libwebp-dev libharfbuzz-dev libfribidi-dev \+ libtiff5-dev \+ libwebp-dev \
ack

without these libs, I can't compile the Docker image

Expand All@@ -19,3 +19,4 @@ RUN --mount=type=cache,target=/root/.cache \

FROM compile-stage AS tests-stage

USER nobody
2 changes: 1 addition & 1 deletion Taskfile.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,7 @@ tasks:
- docker compose run --rm web python pythonie/manage.py migrate

django:collect-static:
desc: Make migrations
desc: Make static resources
cmds:
- docker compose run --rm web python pythonie/manage.py collectstatic

Expand Down
8 changes: 6 additions & 2 deletions pythonie/core/templates/base.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,8 @@
<meta name="description" content=""/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>

<script type="text/javascript" src="//use.typekit.net/qgj1xay.js"></script>
<script type="text/javascript" src="//use.typekit.net/qgj1xay.js"
integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"></script>
<script type="text/javascript">try{Typekit.load({async: false});}catch(e){}</script>


Expand DownExpand Up@@ -56,7 +57,10 @@
{% endcompress %}

{% block basejs %}
<script src="https://code.jquery.com/jquery.js"></script>
<script src="https://code.jquery.com/jquery-1.12.4.js"
integrity="sha256-Qw82+bXyGq6MydymqBxNPYTaUXXq7c8v3CwiYwLLNXU="
crossorigin="anonymous"></script>

<script src="{% static 'js/jquery.smartmenus.js' %}"></script>
<script src="{% static 'js/jquery.smartmenus.bootstrap.js' %}"></script>
<script src="{% static 'js/bootstrap.min.js' %}"></script>
Expand Down
10 changes: 5 additions & 5 deletions pythonie/meetups/test_meetups.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,9 @@
description = (
"<p>We will be having a meetup in June. More details to follow."
"</p> <p>If you are interested in speaking, please submit your "
'details to\xa0<a href="http://bit.ly/pyie-cfp-2015">'
'<a href="http://bit.ly/pyie-cfp-2015" class="linkified">'
"http://bit.ly/pyie-cfp-2015</a></a>.</p> <p>Enquiries? Please "
'details to\xa0<a href="https://bit.ly/pyie-cfp-2015">'
'<a href="https://bit.ly/pyie-cfp-2015" class="linkified">'
"https://bit.ly/pyie-cfp-2015</a></a>.</p> <p>Enquiries? Please "
"contact contact@python.ie.</p>"
)

Expand DownExpand Up@@ -60,7 +60,7 @@ def _first_result(self):
"description": description,
"name": "Python Ireland meetup",
"event_url": (
"http://www.meetup.com/pythonireland/" "events/221078098/"
"https://www.meetup.com/pythonireland/" "events/221078098/"
),
"headcount": 0,
"time": 1433957400000,
Expand DownExpand Up@@ -123,7 +123,7 @@ def test_update_first_run(self, mock_get_content):
self.assertEqual(meetup.visibility, "public")
self.assertEqual(
meetup.event_url,
("http://www.meetup.com/" "pythonireland/events/221078098/"),
("https://www.meetup.com/" "pythonireland/events/221078098/"),
)

@patch("meetups.utils.get_content")
Expand Down
2 changes: 1 addition & 1 deletion pythonie/pythonie/settings/dev.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@

DEBUG = True

SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" # Just for dev
SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" # just for dev #nosec B105
MEETUP_KEY = "" # Put your own key here.
# See https://secure.meetup.com/meetup_api/key/

Expand Down
2 changes: 1 addition & 1 deletion pythonie/pythonie/settings/tests.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@

DEBUG = True

SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" # Just for dev
SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" #nosec B105 # Just for dev
MEETUP_KEY = "" # Put your own key here.
# See https://secure.meetup.com/meetup_api/key/

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
import numpy as np
import pandas as pd
from django.core.management.base import BaseCommand, CommandParser
from django.utils.text import slugify
from wagtail.core.models import Page

from speakers.models import Speaker, Room, Session
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ class SessionizeModel(pydantic.BaseModel):

class Command(BaseCommand):
def handle(self, *args, **kwargs):
response = requests.get("https://sessionize.com/api/v2/z66z4kb6/view/All")
response = requests.get("https://sessionize.com/api/v2/z66z4kb6/view/All", timeout=500)
sessionize: SessionizeModel = SessionizeModel.parse_obj(response.json())

rooms = {}
Expand Down
2 changes: 1 addition & 1 deletion pythonie/speakers/templates/speakers/session.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ <h2>{{ self.name }}</h2>
<a href="{% pageurl speaker %}">{{ speaker.name }}</a>
</td>
<td>
{{ speaker.biography|safe }}
{{ speaker.biography }}
</td>
</tr>
{% endfor %}
Expand Down
6 changes: 4 additions & 2 deletions requirements/dev.in
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
# dev.in
-c main.txt
bandit
black
coverage
django-debug-toolbar
fakeredis
flake8
isort
model-mommy
pipdeptree
django-debug-toolbar
pip-tools
pipdeptree
126 changes: 90 additions & 36 deletions requirements/dev.txt
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,116 @@
asgiref==3.6.0
#
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# pip-compile dev.in
#
asgiref==3.8.1
# via
# -c requirements/main.txt
# -c main.txt
# django
async-timeout==4.0.2
async-timeout==4.0.3
# via
# -c requirements/main.txt
# -c main.txt
# redis
black==23.3.0
# via -r requirements/dev.in
click==8.1.3
# via black
coverage==7.2.2
# via -r requirements/dev.in
django==3.2.18
bandit==1.7.8
# via -r dev.in
black==24.3.0
# via -r dev.in
build==1.1.1
# via pip-tools
click==8.1.7
# via
# black
# pip-tools
coverage==7.4.4
# via -r dev.in
django==3.2.25
# via
# -c requirements/main.txt
# -c main.txt
# django-debug-toolbar
# model-mommy
django-debug-toolbar==3.8.1
# via -r requirements/dev.in
fakeredis==2.10.2
# via -r requirements/dev.in
flake8==6.0.0
# via -r requirements/dev.in
isort==5.12.0
# via -r requirements/dev.in
django-debug-toolbar==4.3.0
# via -r dev.in
fakeredis==2.21.3
# via -r dev.in
flake8==7.0.0
# via -r dev.in
importlib-metadata==7.1.0
# via build
isort==5.13.2
# via -r dev.in
markdown-it-py==3.0.0
# via rich
mccabe==0.7.0
# via flake8
mdurl==0.1.2
# via markdown-it-py
model-mommy==2.0.0
# via -r requirements/dev.in
# via -r dev.in
mypy-extensions==1.0.0
# via black
packaging==23.0
# via black
pathspec==0.11.1
packaging==24.0
# via
# -c main.txt
# black
# build
pathspec==0.12.1
# via black
pipdeptree==2.7.0
# via -r requirements/dev.in
platformdirs==3.2.0
pbr==6.0.0
# via stevedore
pip-tools==7.4.1
# via -r dev.in
pipdeptree==2.16.1
# via -r dev.in
platformdirs==4.2.0
# via black
pycodestyle==2.10.0
pycodestyle==2.11.1
# via flake8
pyflakes==3.0.1
pyflakes==3.2.0
# via flake8
pytz==2023.3
pygments==2.17.2
# via rich
pyproject-hooks==1.0.0
# via
# -c requirements/main.txt
# build
# pip-tools
pytz==2024.1
# via
# -c main.txt
# django
redis==4.5.4
pyyaml==6.0.1
# via bandit
redis==5.0.3
# via
# -c requirements/main.txt
# -c main.txt
# fakeredis
rich==13.7.1
# via bandit
sortedcontainers==2.4.0
# via fakeredis
sqlparse==0.4.3
sqlparse==0.4.4
# via
# -c requirements/main.txt
# -c main.txt
# django
# django-debug-toolbar
stevedore==5.2.0
# via bandit
tomli==2.0.1
# via black
# via
# black
# build
# pip-tools
# pyproject-hooks
typing-extensions==4.10.0
# via
# -c main.txt
# asgiref
# black
wheel==0.43.0
# via pip-tools
zipp==3.18.1
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
# setuptools
5 changes: 3 additions & 2 deletions requirements/main.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,15 +13,16 @@ django-libsass
django-modelcluster
django-storages
django-taggit
gunicorn
gunicorn>=22.0.0
pandas
pydantic
python-dateutil
pytz
redis
requests
wagtail
wagtail-blog
# important to pin that version until that dependency is removed
wagtail-blog==2.3.5
wagtailfontawesome
wagtailnews
whitenoise
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Dockerfile
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
# syntax = docker/dockerfile:1.4
FROM python:3.10 AS compile-stage
FROM python:3.13.0a4-slim AS compile-stage

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
FROM python:3.13.0a4-slim AS compile-stage
FROM python:3.12-slim AS compile-stage

RUN --mount=type=cache,target=/var/cache/apt \
apt update && \
apt install -y --no-install-recommends \

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should to add libraries for the compilation of Pillow 9.5 for Python 3.12

 RUN --mount=type=cache,target=/var/cache/apt \
apt update && \
apt install -y --no-install-recommends \
build-essential gcc neovim fish less iputils-ping postgresql-client \
+ zlib1g-dev libjpeg-dev libraqm-dev libimagequant-dev libtiff-dev \+ libfreetype6-dev liblcms2-dev libwebp-dev libharfbuzz-dev libfribidi-dev \+ libtiff5-dev \+ libwebp-dev \
ack

without these libs, I can't compile the Docker image

Expand All@@ -19,3 +19,4 @@ RUN --mount=type=cache,target=/root/.cache \

FROM compile-stage AS tests-stage

USER nobody
2 changes: 1 addition & 1 deletion Taskfile.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,7 @@ tasks:
- docker compose run --rm web python pythonie/manage.py migrate

django:collect-static:
desc: Make migrations
desc: Make static resources
cmds:
- docker compose run --rm web python pythonie/manage.py collectstatic

Expand Down
8 changes: 6 additions & 2 deletions pythonie/core/templates/base.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,8 @@
<meta name="description" content=""/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>

<script type="text/javascript" src="//use.typekit.net/qgj1xay.js"></script>
<script type="text/javascript" src="//use.typekit.net/qgj1xay.js"
integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"></script>
<script type="text/javascript">try{Typekit.load({async: false});}catch(e){}</script>


Expand DownExpand Up@@ -56,7 +57,10 @@
{% endcompress %}

{% block basejs %}
<script src="https://code.jquery.com/jquery.js"></script>
<script src="https://code.jquery.com/jquery-1.12.4.js"
integrity="sha256-Qw82+bXyGq6MydymqBxNPYTaUXXq7c8v3CwiYwLLNXU="
crossorigin="anonymous"></script>

<script src="{% static 'js/jquery.smartmenus.js' %}"></script>
<script src="{% static 'js/jquery.smartmenus.bootstrap.js' %}"></script>
<script src="{% static 'js/bootstrap.min.js' %}"></script>
Expand Down
10 changes: 5 additions & 5 deletions pythonie/meetups/test_meetups.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,9 @@
description = (
"<p>We will be having a meetup in June. More details to follow."
"</p> <p>If you are interested in speaking, please submit your "
'details to\xa0<a href="http://bit.ly/pyie-cfp-2015">'
'<a href="http://bit.ly/pyie-cfp-2015" class="linkified">'
"http://bit.ly/pyie-cfp-2015</a></a>.</p> <p>Enquiries? Please "
'details to\xa0<a href="https://bit.ly/pyie-cfp-2015">'
'<a href="https://bit.ly/pyie-cfp-2015" class="linkified">'
"https://bit.ly/pyie-cfp-2015</a></a>.</p> <p>Enquiries? Please "
"contact contact@python.ie.</p>"
)

Expand DownExpand Up@@ -60,7 +60,7 @@ def _first_result(self):
"description": description,
"name": "Python Ireland meetup",
"event_url": (
"http://www.meetup.com/pythonireland/" "events/221078098/"
"https://www.meetup.com/pythonireland/" "events/221078098/"
),
"headcount": 0,
"time": 1433957400000,
Expand DownExpand Up@@ -123,7 +123,7 @@ def test_update_first_run(self, mock_get_content):
self.assertEqual(meetup.visibility, "public")
self.assertEqual(
meetup.event_url,
("http://www.meetup.com/" "pythonireland/events/221078098/"),
("https://www.meetup.com/" "pythonireland/events/221078098/"),
)

@patch("meetups.utils.get_content")
Expand Down
2 changes: 1 addition & 1 deletion pythonie/pythonie/settings/dev.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@

DEBUG = True

SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" # Just for dev
SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" # just for dev #nosec B105
MEETUP_KEY = "" # Put your own key here.
# See https://secure.meetup.com/meetup_api/key/

Expand Down
2 changes: 1 addition & 1 deletion pythonie/pythonie/settings/tests.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@

DEBUG = True

SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" # Just for dev
SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" #nosec B105 # Just for dev
MEETUP_KEY = "" # Put your own key here.
# See https://secure.meetup.com/meetup_api/key/

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
import numpy as np
import pandas as pd
from django.core.management.base import BaseCommand, CommandParser
from django.utils.text import slugify
from wagtail.core.models import Page

from speakers.models import Speaker, Room, Session
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ class SessionizeModel(pydantic.BaseModel):

class Command(BaseCommand):
def handle(self, *args, **kwargs):
response = requests.get("https://sessionize.com/api/v2/z66z4kb6/view/All")
response = requests.get("https://sessionize.com/api/v2/z66z4kb6/view/All", timeout=500)
sessionize: SessionizeModel = SessionizeModel.parse_obj(response.json())

rooms = {}
Expand Down
2 changes: 1 addition & 1 deletion pythonie/speakers/templates/speakers/session.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ <h2>{{ self.name }}</h2>
<a href="{% pageurl speaker %}">{{ speaker.name }}</a>
</td>
<td>
{{ speaker.biography|safe }}
{{ speaker.biography }}
</td>
</tr>
{% endfor %}
Expand Down
6 changes: 4 additions & 2 deletions requirements/dev.in
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
# dev.in
-c main.txt
bandit
black
coverage
django-debug-toolbar
fakeredis
flake8
isort
model-mommy
pipdeptree
django-debug-toolbar
pip-tools
pipdeptree
126 changes: 90 additions & 36 deletions requirements/dev.txt
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,116 @@
asgiref==3.6.0
#
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# pip-compile dev.in
#
asgiref==3.8.1
# via
# -c requirements/main.txt
# -c main.txt
# django
async-timeout==4.0.2
async-timeout==4.0.3
# via
# -c requirements/main.txt
# -c main.txt
# redis
black==23.3.0
# via -r requirements/dev.in
click==8.1.3
# via black
coverage==7.2.2
# via -r requirements/dev.in
django==3.2.18
bandit==1.7.8
# via -r dev.in
black==24.3.0
# via -r dev.in
build==1.1.1
# via pip-tools
click==8.1.7
# via
# black
# pip-tools
coverage==7.4.4
# via -r dev.in
django==3.2.25
# via
# -c requirements/main.txt
# -c main.txt
# django-debug-toolbar
# model-mommy
django-debug-toolbar==3.8.1
# via -r requirements/dev.in
fakeredis==2.10.2
# via -r requirements/dev.in
flake8==6.0.0
# via -r requirements/dev.in
isort==5.12.0
# via -r requirements/dev.in
django-debug-toolbar==4.3.0
# via -r dev.in
fakeredis==2.21.3
# via -r dev.in
flake8==7.0.0
# via -r dev.in
importlib-metadata==7.1.0
# via build
isort==5.13.2
# via -r dev.in
markdown-it-py==3.0.0
# via rich
mccabe==0.7.0
# via flake8
mdurl==0.1.2
# via markdown-it-py
model-mommy==2.0.0
# via -r requirements/dev.in
# via -r dev.in
mypy-extensions==1.0.0
# via black
packaging==23.0
# via black
pathspec==0.11.1
packaging==24.0
# via
# -c main.txt
# black
# build
pathspec==0.12.1
# via black
pipdeptree==2.7.0
# via -r requirements/dev.in
platformdirs==3.2.0
pbr==6.0.0
# via stevedore
pip-tools==7.4.1
# via -r dev.in
pipdeptree==2.16.1
# via -r dev.in
platformdirs==4.2.0
# via black
pycodestyle==2.10.0
pycodestyle==2.11.1
# via flake8
pyflakes==3.0.1
pyflakes==3.2.0
# via flake8
pytz==2023.3
pygments==2.17.2
# via rich
pyproject-hooks==1.0.0
# via
# -c requirements/main.txt
# build
# pip-tools
pytz==2024.1
# via
# -c main.txt
# django
redis==4.5.4
pyyaml==6.0.1
# via bandit
redis==5.0.3
# via
# -c requirements/main.txt
# -c main.txt
# fakeredis
rich==13.7.1
# via bandit
sortedcontainers==2.4.0
# via fakeredis
sqlparse==0.4.3
sqlparse==0.4.4
# via
# -c requirements/main.txt
# -c main.txt
# django
# django-debug-toolbar
stevedore==5.2.0
# via bandit
tomli==2.0.1
# via black
# via
# black
# build
# pip-tools
# pyproject-hooks
typing-extensions==4.10.0
# via
# -c main.txt
# asgiref
# black
wheel==0.43.0
# via pip-tools
zipp==3.18.1
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
# setuptools
5 changes: 3 additions & 2 deletions requirements/main.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,15 +13,16 @@ django-libsass
django-modelcluster
django-storages
django-taggit
gunicorn
gunicorn>=22.0.0
pandas
pydantic
python-dateutil
pytz
redis
requests
wagtail
wagtail-blog
# important to pin that version until that dependency is removed
wagtail-blog==2.3.5
wagtailfontawesome
wagtailnews
whitenoise
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Dockerfile
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
# syntax = docker/dockerfile:1.4
FROM python:3.10 AS compile-stage
FROM python:3.13.0a4-slim AS compile-stage

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
FROM python:3.13.0a4-slim AS compile-stage
FROM python:3.12-slim AS compile-stage

RUN --mount=type=cache,target=/var/cache/apt \
apt update && \
apt install -y --no-install-recommends \

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should to add libraries for the compilation of Pillow 9.5 for Python 3.12

 RUN --mount=type=cache,target=/var/cache/apt \
apt update && \
apt install -y --no-install-recommends \
build-essential gcc neovim fish less iputils-ping postgresql-client \
+ zlib1g-dev libjpeg-dev libraqm-dev libimagequant-dev libtiff-dev \+ libfreetype6-dev liblcms2-dev libwebp-dev libharfbuzz-dev libfribidi-dev \+ libtiff5-dev \+ libwebp-dev \
ack

without these libs, I can't compile the Docker image

Expand All@@ -19,3 +19,4 @@ RUN --mount=type=cache,target=/root/.cache \

FROM compile-stage AS tests-stage

USER nobody
2 changes: 1 addition & 1 deletion Taskfile.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,7 @@ tasks:
- docker compose run --rm web python pythonie/manage.py migrate

django:collect-static:
desc: Make migrations
desc: Make static resources
cmds:
- docker compose run --rm web python pythonie/manage.py collectstatic

Expand Down
8 changes: 6 additions & 2 deletions pythonie/core/templates/base.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,8 @@
<meta name="description" content=""/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>

<script type="text/javascript" src="//use.typekit.net/qgj1xay.js"></script>
<script type="text/javascript" src="//use.typekit.net/qgj1xay.js"
integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"></script>
<script type="text/javascript">try{Typekit.load({async: false});}catch(e){}</script>


Expand DownExpand Up@@ -56,7 +57,10 @@
{% endcompress %}

{% block basejs %}
<script src="https://code.jquery.com/jquery.js"></script>
<script src="https://code.jquery.com/jquery-1.12.4.js"
integrity="sha256-Qw82+bXyGq6MydymqBxNPYTaUXXq7c8v3CwiYwLLNXU="
crossorigin="anonymous"></script>

<script src="{% static 'js/jquery.smartmenus.js' %}"></script>
<script src="{% static 'js/jquery.smartmenus.bootstrap.js' %}"></script>
<script src="{% static 'js/bootstrap.min.js' %}"></script>
Expand Down
10 changes: 5 additions & 5 deletions pythonie/meetups/test_meetups.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,9 @@
description = (
"<p>We will be having a meetup in June. More details to follow."
"</p> <p>If you are interested in speaking, please submit your "
'details to\xa0<a href="http://bit.ly/pyie-cfp-2015">'
'<a href="http://bit.ly/pyie-cfp-2015" class="linkified">'
"http://bit.ly/pyie-cfp-2015</a></a>.</p> <p>Enquiries? Please "
'details to\xa0<a href="https://bit.ly/pyie-cfp-2015">'
'<a href="https://bit.ly/pyie-cfp-2015" class="linkified">'
"https://bit.ly/pyie-cfp-2015</a></a>.</p> <p>Enquiries? Please "
"contact contact@python.ie.</p>"
)

Expand DownExpand Up@@ -60,7 +60,7 @@ def _first_result(self):
"description": description,
"name": "Python Ireland meetup",
"event_url": (
"http://www.meetup.com/pythonireland/" "events/221078098/"
"https://www.meetup.com/pythonireland/" "events/221078098/"
),
"headcount": 0,
"time": 1433957400000,
Expand DownExpand Up@@ -123,7 +123,7 @@ def test_update_first_run(self, mock_get_content):
self.assertEqual(meetup.visibility, "public")
self.assertEqual(
meetup.event_url,
("http://www.meetup.com/" "pythonireland/events/221078098/"),
("https://www.meetup.com/" "pythonireland/events/221078098/"),
)

@patch("meetups.utils.get_content")
Expand Down
2 changes: 1 addition & 1 deletion pythonie/pythonie/settings/dev.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@

DEBUG = True

SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" # Just for dev
SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" # just for dev #nosec B105
MEETUP_KEY = "" # Put your own key here.
# See https://secure.meetup.com/meetup_api/key/

Expand Down
2 changes: 1 addition & 1 deletion pythonie/pythonie/settings/tests.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@

DEBUG = True

SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" # Just for dev
SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" #nosec B105 # Just for dev
MEETUP_KEY = "" # Put your own key here.
# See https://secure.meetup.com/meetup_api/key/

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
import numpy as np
import pandas as pd
from django.core.management.base import BaseCommand, CommandParser
from django.utils.text import slugify
from wagtail.core.models import Page

from speakers.models import Speaker, Room, Session
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ class SessionizeModel(pydantic.BaseModel):

class Command(BaseCommand):
def handle(self, *args, **kwargs):
response = requests.get("https://sessionize.com/api/v2/z66z4kb6/view/All")
response = requests.get("https://sessionize.com/api/v2/z66z4kb6/view/All", timeout=500)
sessionize: SessionizeModel = SessionizeModel.parse_obj(response.json())

rooms = {}
Expand Down
2 changes: 1 addition & 1 deletion pythonie/speakers/templates/speakers/session.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ <h2>{{ self.name }}</h2>
<a href="{% pageurl speaker %}">{{ speaker.name }}</a>
</td>
<td>
{{ speaker.biography|safe }}
{{ speaker.biography }}
</td>
</tr>
{% endfor %}
Expand Down
6 changes: 4 additions & 2 deletions requirements/dev.in
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
# dev.in
-c main.txt
bandit
black
coverage
django-debug-toolbar
fakeredis
flake8
isort
model-mommy
pipdeptree
django-debug-toolbar
pip-tools
pipdeptree
126 changes: 90 additions & 36 deletions requirements/dev.txt
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,116 @@
asgiref==3.6.0
#
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# pip-compile dev.in
#
asgiref==3.8.1
# via
# -c requirements/main.txt
# -c main.txt
# django
async-timeout==4.0.2
async-timeout==4.0.3
# via
# -c requirements/main.txt
# -c main.txt
# redis
black==23.3.0
# via -r requirements/dev.in
click==8.1.3
# via black
coverage==7.2.2
# via -r requirements/dev.in
django==3.2.18
bandit==1.7.8
# via -r dev.in
black==24.3.0
# via -r dev.in
build==1.1.1
# via pip-tools
click==8.1.7
# via
# black
# pip-tools
coverage==7.4.4
# via -r dev.in
django==3.2.25
# via
# -c requirements/main.txt
# -c main.txt
# django-debug-toolbar
# model-mommy
django-debug-toolbar==3.8.1
# via -r requirements/dev.in
fakeredis==2.10.2
# via -r requirements/dev.in
flake8==6.0.0
# via -r requirements/dev.in
isort==5.12.0
# via -r requirements/dev.in
django-debug-toolbar==4.3.0
# via -r dev.in
fakeredis==2.21.3
# via -r dev.in
flake8==7.0.0
# via -r dev.in
importlib-metadata==7.1.0
# via build
isort==5.13.2
# via -r dev.in
markdown-it-py==3.0.0
# via rich
mccabe==0.7.0
# via flake8
mdurl==0.1.2
# via markdown-it-py
model-mommy==2.0.0
# via -r requirements/dev.in
# via -r dev.in
mypy-extensions==1.0.0
# via black
packaging==23.0
# via black
pathspec==0.11.1
packaging==24.0
# via
# -c main.txt
# black
# build
pathspec==0.12.1
# via black
pipdeptree==2.7.0
# via -r requirements/dev.in
platformdirs==3.2.0
pbr==6.0.0
# via stevedore
pip-tools==7.4.1
# via -r dev.in
pipdeptree==2.16.1
# via -r dev.in
platformdirs==4.2.0
# via black
pycodestyle==2.10.0
pycodestyle==2.11.1
# via flake8
pyflakes==3.0.1
pyflakes==3.2.0
# via flake8
pytz==2023.3
pygments==2.17.2
# via rich
pyproject-hooks==1.0.0
# via
# -c requirements/main.txt
# build
# pip-tools
pytz==2024.1
# via
# -c main.txt
# django
redis==4.5.4
pyyaml==6.0.1
# via bandit
redis==5.0.3
# via
# -c requirements/main.txt
# -c main.txt
# fakeredis
rich==13.7.1
# via bandit
sortedcontainers==2.4.0
# via fakeredis
sqlparse==0.4.3
sqlparse==0.4.4
# via
# -c requirements/main.txt
# -c main.txt
# django
# django-debug-toolbar
stevedore==5.2.0
# via bandit
tomli==2.0.1
# via black
# via
# black
# build
# pip-tools
# pyproject-hooks
typing-extensions==4.10.0
# via
# -c main.txt
# asgiref
# black
wheel==0.43.0
# via pip-tools
zipp==3.18.1
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
# setuptools
5 changes: 3 additions & 2 deletions requirements/main.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,15 +13,16 @@ django-libsass
django-modelcluster
django-storages
django-taggit
gunicorn
gunicorn>=22.0.0
pandas
pydantic
python-dateutil
pytz
redis
requests
wagtail
wagtail-blog
# important to pin that version until that dependency is removed
wagtail-blog==2.3.5
wagtailfontawesome
wagtailnews
whitenoise
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Dockerfile
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
# syntax = docker/dockerfile:1.4
FROM python:3.10 AS compile-stage
FROM python:3.13.0a4-slim AS compile-stage

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
FROM python:3.13.0a4-slim AS compile-stage
FROM python:3.12-slim AS compile-stage

RUN --mount=type=cache,target=/var/cache/apt \
apt update && \
apt install -y --no-install-recommends \

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should to add libraries for the compilation of Pillow 9.5 for Python 3.12

 RUN --mount=type=cache,target=/var/cache/apt \
apt update && \
apt install -y --no-install-recommends \
build-essential gcc neovim fish less iputils-ping postgresql-client \
+ zlib1g-dev libjpeg-dev libraqm-dev libimagequant-dev libtiff-dev \+ libfreetype6-dev liblcms2-dev libwebp-dev libharfbuzz-dev libfribidi-dev \+ libtiff5-dev \+ libwebp-dev \
ack

without these libs, I can't compile the Docker image

Expand All@@ -19,3 +19,4 @@ RUN --mount=type=cache,target=/root/.cache \

FROM compile-stage AS tests-stage

USER nobody
2 changes: 1 addition & 1 deletion Taskfile.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,7 @@ tasks:
- docker compose run --rm web python pythonie/manage.py migrate

django:collect-static:
desc: Make migrations
desc: Make static resources
cmds:
- docker compose run --rm web python pythonie/manage.py collectstatic

Expand Down
8 changes: 6 additions & 2 deletions pythonie/core/templates/base.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,8 @@
<meta name="description" content=""/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>

<script type="text/javascript" src="//use.typekit.net/qgj1xay.js"></script>
<script type="text/javascript" src="//use.typekit.net/qgj1xay.js"
integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"></script>
<script type="text/javascript">try{Typekit.load({async: false});}catch(e){}</script>


Expand DownExpand Up@@ -56,7 +57,10 @@
{% endcompress %}

{% block basejs %}
<script src="https://code.jquery.com/jquery.js"></script>
<script src="https://code.jquery.com/jquery-1.12.4.js"
integrity="sha256-Qw82+bXyGq6MydymqBxNPYTaUXXq7c8v3CwiYwLLNXU="
crossorigin="anonymous"></script>

<script src="{% static 'js/jquery.smartmenus.js' %}"></script>
<script src="{% static 'js/jquery.smartmenus.bootstrap.js' %}"></script>
<script src="{% static 'js/bootstrap.min.js' %}"></script>
Expand Down
10 changes: 5 additions & 5 deletions pythonie/meetups/test_meetups.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,9 @@
description = (
"<p>We will be having a meetup in June. More details to follow."
"</p> <p>If you are interested in speaking, please submit your "
'details to\xa0<a href="http://bit.ly/pyie-cfp-2015">'
'<a href="http://bit.ly/pyie-cfp-2015" class="linkified">'
"http://bit.ly/pyie-cfp-2015</a></a>.</p> <p>Enquiries? Please "
'details to\xa0<a href="https://bit.ly/pyie-cfp-2015">'
'<a href="https://bit.ly/pyie-cfp-2015" class="linkified">'
"https://bit.ly/pyie-cfp-2015</a></a>.</p> <p>Enquiries? Please "
"contact contact@python.ie.</p>"
)

Expand DownExpand Up@@ -60,7 +60,7 @@ def _first_result(self):
"description": description,
"name": "Python Ireland meetup",
"event_url": (
"http://www.meetup.com/pythonireland/" "events/221078098/"
"https://www.meetup.com/pythonireland/" "events/221078098/"
),
"headcount": 0,
"time": 1433957400000,
Expand DownExpand Up@@ -123,7 +123,7 @@ def test_update_first_run(self, mock_get_content):
self.assertEqual(meetup.visibility, "public")
self.assertEqual(
meetup.event_url,
("http://www.meetup.com/" "pythonireland/events/221078098/"),
("https://www.meetup.com/" "pythonireland/events/221078098/"),
)

@patch("meetups.utils.get_content")
Expand Down
2 changes: 1 addition & 1 deletion pythonie/pythonie/settings/dev.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@

DEBUG = True

SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" # Just for dev
SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" # just for dev #nosec B105
MEETUP_KEY = "" # Put your own key here.
# See https://secure.meetup.com/meetup_api/key/

Expand Down
2 changes: 1 addition & 1 deletion pythonie/pythonie/settings/tests.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@

DEBUG = True

SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" # Just for dev
SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" #nosec B105 # Just for dev
MEETUP_KEY = "" # Put your own key here.
# See https://secure.meetup.com/meetup_api/key/

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
import numpy as np
import pandas as pd
from django.core.management.base import BaseCommand, CommandParser
from django.utils.text import slugify
from wagtail.core.models import Page

from speakers.models import Speaker, Room, Session
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ class SessionizeModel(pydantic.BaseModel):

class Command(BaseCommand):
def handle(self, *args, **kwargs):
response = requests.get("https://sessionize.com/api/v2/z66z4kb6/view/All")
response = requests.get("https://sessionize.com/api/v2/z66z4kb6/view/All", timeout=500)
sessionize: SessionizeModel = SessionizeModel.parse_obj(response.json())

rooms = {}
Expand Down
2 changes: 1 addition & 1 deletion pythonie/speakers/templates/speakers/session.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ <h2>{{ self.name }}</h2>
<a href="{% pageurl speaker %}">{{ speaker.name }}</a>
</td>
<td>
{{ speaker.biography|safe }}
{{ speaker.biography }}
</td>
</tr>
{% endfor %}
Expand Down
6 changes: 4 additions & 2 deletions requirements/dev.in
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
# dev.in
-c main.txt
bandit
black
coverage
django-debug-toolbar
fakeredis
flake8
isort
model-mommy
pipdeptree
django-debug-toolbar
pip-tools
pipdeptree
126 changes: 90 additions & 36 deletions requirements/dev.txt
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,116 @@
asgiref==3.6.0
#
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# pip-compile dev.in
#
asgiref==3.8.1
# via
# -c requirements/main.txt
# -c main.txt
# django
async-timeout==4.0.2
async-timeout==4.0.3
# via
# -c requirements/main.txt
# -c main.txt
# redis
black==23.3.0
# via -r requirements/dev.in
click==8.1.3
# via black
coverage==7.2.2
# via -r requirements/dev.in
django==3.2.18
bandit==1.7.8
# via -r dev.in
black==24.3.0
# via -r dev.in
build==1.1.1
# via pip-tools
click==8.1.7
# via
# black
# pip-tools
coverage==7.4.4
# via -r dev.in
django==3.2.25
# via
# -c requirements/main.txt
# -c main.txt
# django-debug-toolbar
# model-mommy
django-debug-toolbar==3.8.1
# via -r requirements/dev.in
fakeredis==2.10.2
# via -r requirements/dev.in
flake8==6.0.0
# via -r requirements/dev.in
isort==5.12.0
# via -r requirements/dev.in
django-debug-toolbar==4.3.0
# via -r dev.in
fakeredis==2.21.3
# via -r dev.in
flake8==7.0.0
# via -r dev.in
importlib-metadata==7.1.0
# via build
isort==5.13.2
# via -r dev.in
markdown-it-py==3.0.0
# via rich
mccabe==0.7.0
# via flake8
mdurl==0.1.2
# via markdown-it-py
model-mommy==2.0.0
# via -r requirements/dev.in
# via -r dev.in
mypy-extensions==1.0.0
# via black
packaging==23.0
# via black
pathspec==0.11.1
packaging==24.0
# via
# -c main.txt
# black
# build
pathspec==0.12.1
# via black
pipdeptree==2.7.0
# via -r requirements/dev.in
platformdirs==3.2.0
pbr==6.0.0
# via stevedore
pip-tools==7.4.1
# via -r dev.in
pipdeptree==2.16.1
# via -r dev.in
platformdirs==4.2.0
# via black
pycodestyle==2.10.0
pycodestyle==2.11.1
# via flake8
pyflakes==3.0.1
pyflakes==3.2.0
# via flake8
pytz==2023.3
pygments==2.17.2
# via rich
pyproject-hooks==1.0.0
# via
# -c requirements/main.txt
# build
# pip-tools
pytz==2024.1
# via
# -c main.txt
# django
redis==4.5.4
pyyaml==6.0.1
# via bandit
redis==5.0.3
# via
# -c requirements/main.txt
# -c main.txt
# fakeredis
rich==13.7.1
# via bandit
sortedcontainers==2.4.0
# via fakeredis
sqlparse==0.4.3
sqlparse==0.4.4
# via
# -c requirements/main.txt
# -c main.txt
# django
# django-debug-toolbar
stevedore==5.2.0
# via bandit
tomli==2.0.1
# via black
# via
# black
# build
# pip-tools
# pyproject-hooks
typing-extensions==4.10.0
# via
# -c main.txt
# asgiref
# black
wheel==0.43.0
# via pip-tools
zipp==3.18.1
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
# setuptools
5 changes: 3 additions & 2 deletions requirements/main.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,15 +13,16 @@ django-libsass
django-modelcluster
django-storages
django-taggit
gunicorn
gunicorn>=22.0.0
pandas
pydantic
python-dateutil
pytz
redis
requests
wagtail
wagtail-blog
# important to pin that version until that dependency is removed
wagtail-blog==2.3.5
wagtailfontawesome
wagtailnews
whitenoise
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Dockerfile
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
# syntax = docker/dockerfile:1.4
FROM python:3.10 AS compile-stage
FROM python:3.13.0a4-slim AS compile-stage

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
FROM python:3.13.0a4-slim AS compile-stage
FROM python:3.12-slim AS compile-stage

RUN --mount=type=cache,target=/var/cache/apt \
apt update && \
apt install -y --no-install-recommends \

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should to add libraries for the compilation of Pillow 9.5 for Python 3.12

 RUN --mount=type=cache,target=/var/cache/apt \
apt update && \
apt install -y --no-install-recommends \
build-essential gcc neovim fish less iputils-ping postgresql-client \
+ zlib1g-dev libjpeg-dev libraqm-dev libimagequant-dev libtiff-dev \+ libfreetype6-dev liblcms2-dev libwebp-dev libharfbuzz-dev libfribidi-dev \+ libtiff5-dev \+ libwebp-dev \
ack

without these libs, I can't compile the Docker image

Expand All@@ -19,3 +19,4 @@ RUN --mount=type=cache,target=/root/.cache \

FROM compile-stage AS tests-stage

USER nobody
2 changes: 1 addition & 1 deletion Taskfile.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,7 @@ tasks:
- docker compose run --rm web python pythonie/manage.py migrate

django:collect-static:
desc: Make migrations
desc: Make static resources
cmds:
- docker compose run --rm web python pythonie/manage.py collectstatic

Expand Down
8 changes: 6 additions & 2 deletions pythonie/core/templates/base.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,8 @@
<meta name="description" content=""/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>

<script type="text/javascript" src="//use.typekit.net/qgj1xay.js"></script>
<script type="text/javascript" src="//use.typekit.net/qgj1xay.js"
integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"></script>
<script type="text/javascript">try{Typekit.load({async: false});}catch(e){}</script>


Expand DownExpand Up@@ -56,7 +57,10 @@
{% endcompress %}

{% block basejs %}
<script src="https://code.jquery.com/jquery.js"></script>
<script src="https://code.jquery.com/jquery-1.12.4.js"
integrity="sha256-Qw82+bXyGq6MydymqBxNPYTaUXXq7c8v3CwiYwLLNXU="
crossorigin="anonymous"></script>

<script src="{% static 'js/jquery.smartmenus.js' %}"></script>
<script src="{% static 'js/jquery.smartmenus.bootstrap.js' %}"></script>
<script src="{% static 'js/bootstrap.min.js' %}"></script>
Expand Down
10 changes: 5 additions & 5 deletions pythonie/meetups/test_meetups.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,9 @@
description = (
"<p>We will be having a meetup in June. More details to follow."
"</p> <p>If you are interested in speaking, please submit your "
'details to\xa0<a href="http://bit.ly/pyie-cfp-2015">'
'<a href="http://bit.ly/pyie-cfp-2015" class="linkified">'
"http://bit.ly/pyie-cfp-2015</a></a>.</p> <p>Enquiries? Please "
'details to\xa0<a href="https://bit.ly/pyie-cfp-2015">'
'<a href="https://bit.ly/pyie-cfp-2015" class="linkified">'
"https://bit.ly/pyie-cfp-2015</a></a>.</p> <p>Enquiries? Please "
"contact contact@python.ie.</p>"
)

Expand DownExpand Up@@ -60,7 +60,7 @@ def _first_result(self):
"description": description,
"name": "Python Ireland meetup",
"event_url": (
"http://www.meetup.com/pythonireland/" "events/221078098/"
"https://www.meetup.com/pythonireland/" "events/221078098/"
),
"headcount": 0,
"time": 1433957400000,
Expand DownExpand Up@@ -123,7 +123,7 @@ def test_update_first_run(self, mock_get_content):
self.assertEqual(meetup.visibility, "public")
self.assertEqual(
meetup.event_url,
("http://www.meetup.com/" "pythonireland/events/221078098/"),
("https://www.meetup.com/" "pythonireland/events/221078098/"),
)

@patch("meetups.utils.get_content")
Expand Down
2 changes: 1 addition & 1 deletion pythonie/pythonie/settings/dev.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@

DEBUG = True

SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" # Just for dev
SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" # just for dev #nosec B105
MEETUP_KEY = "" # Put your own key here.
# See https://secure.meetup.com/meetup_api/key/

Expand Down
2 changes: 1 addition & 1 deletion pythonie/pythonie/settings/tests.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@

DEBUG = True

SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" # Just for dev
SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" #nosec B105 # Just for dev
MEETUP_KEY = "" # Put your own key here.
# See https://secure.meetup.com/meetup_api/key/

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
import numpy as np
import pandas as pd
from django.core.management.base import BaseCommand, CommandParser
from django.utils.text import slugify
from wagtail.core.models import Page

from speakers.models import Speaker, Room, Session
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ class SessionizeModel(pydantic.BaseModel):

class Command(BaseCommand):
def handle(self, *args, **kwargs):
response = requests.get("https://sessionize.com/api/v2/z66z4kb6/view/All")
response = requests.get("https://sessionize.com/api/v2/z66z4kb6/view/All", timeout=500)
sessionize: SessionizeModel = SessionizeModel.parse_obj(response.json())

rooms = {}
Expand Down
2 changes: 1 addition & 1 deletion pythonie/speakers/templates/speakers/session.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ <h2>{{ self.name }}</h2>
<a href="{% pageurl speaker %}">{{ speaker.name }}</a>
</td>
<td>
{{ speaker.biography|safe }}
{{ speaker.biography }}
</td>
</tr>
{% endfor %}
Expand Down
6 changes: 4 additions & 2 deletions requirements/dev.in
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
# dev.in
-c main.txt
bandit
black
coverage
django-debug-toolbar
fakeredis
flake8
isort
model-mommy
pipdeptree
django-debug-toolbar
pip-tools
pipdeptree
126 changes: 90 additions & 36 deletions requirements/dev.txt
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,116 @@
asgiref==3.6.0
#
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# pip-compile dev.in
#
asgiref==3.8.1
# via
# -c requirements/main.txt
# -c main.txt
# django
async-timeout==4.0.2
async-timeout==4.0.3
# via
# -c requirements/main.txt
# -c main.txt
# redis
black==23.3.0
# via -r requirements/dev.in
click==8.1.3
# via black
coverage==7.2.2
# via -r requirements/dev.in
django==3.2.18
bandit==1.7.8
# via -r dev.in
black==24.3.0
# via -r dev.in
build==1.1.1
# via pip-tools
click==8.1.7
# via
# black
# pip-tools
coverage==7.4.4
# via -r dev.in
django==3.2.25
# via
# -c requirements/main.txt
# -c main.txt
# django-debug-toolbar
# model-mommy
django-debug-toolbar==3.8.1
# via -r requirements/dev.in
fakeredis==2.10.2
# via -r requirements/dev.in
flake8==6.0.0
# via -r requirements/dev.in
isort==5.12.0
# via -r requirements/dev.in
django-debug-toolbar==4.3.0
# via -r dev.in
fakeredis==2.21.3
# via -r dev.in
flake8==7.0.0
# via -r dev.in
importlib-metadata==7.1.0
# via build
isort==5.13.2
# via -r dev.in
markdown-it-py==3.0.0
# via rich
mccabe==0.7.0
# via flake8
mdurl==0.1.2
# via markdown-it-py
model-mommy==2.0.0
# via -r requirements/dev.in
# via -r dev.in
mypy-extensions==1.0.0
# via black
packaging==23.0
# via black
pathspec==0.11.1
packaging==24.0
# via
# -c main.txt
# black
# build
pathspec==0.12.1
# via black
pipdeptree==2.7.0
# via -r requirements/dev.in
platformdirs==3.2.0
pbr==6.0.0
# via stevedore
pip-tools==7.4.1
# via -r dev.in
pipdeptree==2.16.1
# via -r dev.in
platformdirs==4.2.0
# via black
pycodestyle==2.10.0
pycodestyle==2.11.1
# via flake8
pyflakes==3.0.1
pyflakes==3.2.0
# via flake8
pytz==2023.3
pygments==2.17.2
# via rich
pyproject-hooks==1.0.0
# via
# -c requirements/main.txt
# build
# pip-tools
pytz==2024.1
# via
# -c main.txt
# django
redis==4.5.4
pyyaml==6.0.1
# via bandit
redis==5.0.3
# via
# -c requirements/main.txt
# -c main.txt
# fakeredis
rich==13.7.1
# via bandit
sortedcontainers==2.4.0
# via fakeredis
sqlparse==0.4.3
sqlparse==0.4.4
# via
# -c requirements/main.txt
# -c main.txt
# django
# django-debug-toolbar
stevedore==5.2.0
# via bandit
tomli==2.0.1
# via black
# via
# black
# build
# pip-tools
# pyproject-hooks
typing-extensions==4.10.0
# via
# -c main.txt
# asgiref
# black
wheel==0.43.0
# via pip-tools
zipp==3.18.1
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
# setuptools
5 changes: 3 additions & 2 deletions requirements/main.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,15 +13,16 @@ django-libsass
django-modelcluster
django-storages
django-taggit
gunicorn
gunicorn>=22.0.0
pandas
pydantic
python-dateutil
pytz
redis
requests
wagtail
wagtail-blog
# important to pin that version until that dependency is removed
wagtail-blog==2.3.5
wagtailfontawesome
wagtailnews
whitenoise
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Dockerfile
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
# syntax = docker/dockerfile:1.4
FROM python:3.10 AS compile-stage
FROM python:3.13.0a4-slim AS compile-stage

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
FROM python:3.13.0a4-slim AS compile-stage
FROM python:3.12-slim AS compile-stage

RUN --mount=type=cache,target=/var/cache/apt \
apt update && \
apt install -y --no-install-recommends \

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should to add libraries for the compilation of Pillow 9.5 for Python 3.12

 RUN --mount=type=cache,target=/var/cache/apt \
apt update && \
apt install -y --no-install-recommends \
build-essential gcc neovim fish less iputils-ping postgresql-client \
+ zlib1g-dev libjpeg-dev libraqm-dev libimagequant-dev libtiff-dev \+ libfreetype6-dev liblcms2-dev libwebp-dev libharfbuzz-dev libfribidi-dev \+ libtiff5-dev \+ libwebp-dev \
ack

without these libs, I can't compile the Docker image

Expand All@@ -19,3 +19,4 @@ RUN --mount=type=cache,target=/root/.cache \

FROM compile-stage AS tests-stage

USER nobody
2 changes: 1 addition & 1 deletion Taskfile.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,7 @@ tasks:
- docker compose run --rm web python pythonie/manage.py migrate

django:collect-static:
desc: Make migrations
desc: Make static resources
cmds:
- docker compose run --rm web python pythonie/manage.py collectstatic

Expand Down
8 changes: 6 additions & 2 deletions pythonie/core/templates/base.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,8 @@
<meta name="description" content=""/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>

<script type="text/javascript" src="//use.typekit.net/qgj1xay.js"></script>
<script type="text/javascript" src="//use.typekit.net/qgj1xay.js"
integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"></script>
<script type="text/javascript">try{Typekit.load({async: false});}catch(e){}</script>


Expand DownExpand Up@@ -56,7 +57,10 @@
{% endcompress %}

{% block basejs %}
<script src="https://code.jquery.com/jquery.js"></script>
<script src="https://code.jquery.com/jquery-1.12.4.js"
integrity="sha256-Qw82+bXyGq6MydymqBxNPYTaUXXq7c8v3CwiYwLLNXU="
crossorigin="anonymous"></script>

<script src="{% static 'js/jquery.smartmenus.js' %}"></script>
<script src="{% static 'js/jquery.smartmenus.bootstrap.js' %}"></script>
<script src="{% static 'js/bootstrap.min.js' %}"></script>
Expand Down
10 changes: 5 additions & 5 deletions pythonie/meetups/test_meetups.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,9 @@
description = (
"<p>We will be having a meetup in June. More details to follow."
"</p> <p>If you are interested in speaking, please submit your "
'details to\xa0<a href="http://bit.ly/pyie-cfp-2015">'
'<a href="http://bit.ly/pyie-cfp-2015" class="linkified">'
"http://bit.ly/pyie-cfp-2015</a></a>.</p> <p>Enquiries? Please "
'details to\xa0<a href="https://bit.ly/pyie-cfp-2015">'
'<a href="https://bit.ly/pyie-cfp-2015" class="linkified">'
"https://bit.ly/pyie-cfp-2015</a></a>.</p> <p>Enquiries? Please "
"contact contact@python.ie.</p>"
)

Expand DownExpand Up@@ -60,7 +60,7 @@ def _first_result(self):
"description": description,
"name": "Python Ireland meetup",
"event_url": (
"http://www.meetup.com/pythonireland/" "events/221078098/"
"https://www.meetup.com/pythonireland/" "events/221078098/"
),
"headcount": 0,
"time": 1433957400000,
Expand DownExpand Up@@ -123,7 +123,7 @@ def test_update_first_run(self, mock_get_content):
self.assertEqual(meetup.visibility, "public")
self.assertEqual(
meetup.event_url,
("http://www.meetup.com/" "pythonireland/events/221078098/"),
("https://www.meetup.com/" "pythonireland/events/221078098/"),
)

@patch("meetups.utils.get_content")
Expand Down
2 changes: 1 addition & 1 deletion pythonie/pythonie/settings/dev.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@

DEBUG = True

SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" # Just for dev
SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" # just for dev #nosec B105
MEETUP_KEY = "" # Put your own key here.
# See https://secure.meetup.com/meetup_api/key/

Expand Down
2 changes: 1 addition & 1 deletion pythonie/pythonie/settings/tests.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@

DEBUG = True

SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" # Just for dev
SECRET_KEY = "1185a082-7e72-449e-bf43-12d2da59222b" #nosec B105 # Just for dev
MEETUP_KEY = "" # Put your own key here.
# See https://secure.meetup.com/meetup_api/key/

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
import numpy as np
import pandas as pd
from django.core.management.base import BaseCommand, CommandParser
from django.utils.text import slugify
from wagtail.core.models import Page

from speakers.models import Speaker, Room, Session
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,7 +51,7 @@ class SessionizeModel(pydantic.BaseModel):

class Command(BaseCommand):
def handle(self, *args, **kwargs):
response = requests.get("https://sessionize.com/api/v2/z66z4kb6/view/All")
response = requests.get("https://sessionize.com/api/v2/z66z4kb6/view/All", timeout=500)
sessionize: SessionizeModel = SessionizeModel.parse_obj(response.json())

rooms = {}
Expand Down
2 changes: 1 addition & 1 deletion pythonie/speakers/templates/speakers/session.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ <h2>{{ self.name }}</h2>
<a href="{% pageurl speaker %}">{{ speaker.name }}</a>
</td>
<td>
{{ speaker.biography|safe }}
{{ speaker.biography }}
</td>
</tr>
{% endfor %}
Expand Down
6 changes: 4 additions & 2 deletions requirements/dev.in
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
# dev.in
-c main.txt
bandit
black
coverage
django-debug-toolbar
fakeredis
flake8
isort
model-mommy
pipdeptree
django-debug-toolbar
pip-tools
pipdeptree
126 changes: 90 additions & 36 deletions requirements/dev.txt
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,116 @@
asgiref==3.6.0
#
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# pip-compile dev.in
#
asgiref==3.8.1
# via
# -c requirements/main.txt
# -c main.txt
# django
async-timeout==4.0.2
async-timeout==4.0.3
# via
# -c requirements/main.txt
# -c main.txt
# redis
black==23.3.0
# via -r requirements/dev.in
click==8.1.3
# via black
coverage==7.2.2
# via -r requirements/dev.in
django==3.2.18
bandit==1.7.8
# via -r dev.in
black==24.3.0
# via -r dev.in
build==1.1.1
# via pip-tools
click==8.1.7
# via
# black
# pip-tools
coverage==7.4.4
# via -r dev.in
django==3.2.25
# via
# -c requirements/main.txt
# -c main.txt
# django-debug-toolbar
# model-mommy
django-debug-toolbar==3.8.1
# via -r requirements/dev.in
fakeredis==2.10.2
# via -r requirements/dev.in
flake8==6.0.0
# via -r requirements/dev.in
isort==5.12.0
# via -r requirements/dev.in
django-debug-toolbar==4.3.0
# via -r dev.in
fakeredis==2.21.3
# via -r dev.in
flake8==7.0.0
# via -r dev.in
importlib-metadata==7.1.0
# via build
isort==5.13.2
# via -r dev.in
markdown-it-py==3.0.0
# via rich
mccabe==0.7.0
# via flake8
mdurl==0.1.2
# via markdown-it-py
model-mommy==2.0.0
# via -r requirements/dev.in
# via -r dev.in
mypy-extensions==1.0.0
# via black
packaging==23.0
# via black
pathspec==0.11.1
packaging==24.0
# via
# -c main.txt
# black
# build
pathspec==0.12.1
# via black
pipdeptree==2.7.0
# via -r requirements/dev.in
platformdirs==3.2.0
pbr==6.0.0
# via stevedore
pip-tools==7.4.1
# via -r dev.in
pipdeptree==2.16.1
# via -r dev.in
platformdirs==4.2.0
# via black
pycodestyle==2.10.0
pycodestyle==2.11.1
# via flake8
pyflakes==3.0.1
pyflakes==3.2.0
# via flake8
pytz==2023.3
pygments==2.17.2
# via rich
pyproject-hooks==1.0.0
# via
# -c requirements/main.txt
# build
# pip-tools
pytz==2024.1
# via
# -c main.txt
# django
redis==4.5.4
pyyaml==6.0.1
# via bandit
redis==5.0.3
# via
# -c requirements/main.txt
# -c main.txt
# fakeredis
rich==13.7.1
# via bandit
sortedcontainers==2.4.0
# via fakeredis
sqlparse==0.4.3
sqlparse==0.4.4
# via
# -c requirements/main.txt
# -c main.txt
# django
# django-debug-toolbar
stevedore==5.2.0
# via bandit
tomli==2.0.1
# via black
# via
# black
# build
# pip-tools
# pyproject-hooks
typing-extensions==4.10.0
# via
# -c main.txt
# asgiref
# black
wheel==0.43.0
# via pip-tools
zipp==3.18.1
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
# setuptools
5 changes: 3 additions & 2 deletions requirements/main.in
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,15 +13,16 @@ django-libsass
django-modelcluster
django-storages
django-taggit
gunicorn
gunicorn>=22.0.0
pandas
pydantic
python-dateutil
pytz
redis
requests
wagtail
wagtail-blog
# important to pin that version until that dependency is removed
wagtail-blog==2.3.5
wagtailfontawesome
wagtailnews
whitenoise
Loading