update django to 4.2 #527

glbert-does · 2023-11-23T22:19:35Z

if you do not want cacheops in debug mode, you should set CACHEOPS_ENABLED = False in your settings now.
django-select2-forms is not compatible with django 4+. the way i understand it, it has not been developed for a while, since django 2 supposedly supports select2 directly. ~~i don't really see where we even use select2, so i simply removed it.~~ removing it is not possible, unless we squash migrations.

edit: this will also close #525

glbert-does · 2024-02-07T11:37:31Z

just noticed that django 5 was released in the meantime. will soon work on upgrading.

nicwest

LGTM, a few minor cosmetic things @lakinwecker can we get this merged?

nicwest · 2024-12-01T16:07:07Z

heltour/tournament/admin.py

@@ -544,7 +543,7 @@ def review_nominated_games_pgn_view(self, request, object_id):
        pgn = lichessapi.get_pgn_with_cache(gameid, priority=10)

        # Strip most tags for "blind" review
-        pgn = re.sub('\[[^R]\w+ ".*"\]\n', '', pgn)
+        pgn = re.sub('\\[[^R]\\w+ ".*"\\]\n', '', pgn)


but I think the pythonic way of doing this is using a regrex string literal:

Suggested change

pgn = re.sub('\\[[^R]\\w+ ".*"\\]\n', '', pgn)

pgn = re.sub(r'\[[^R]\w+ ".*"\]\n', '', pgn)

The solution is to use Python’s raw string notation for regular expression patterns; backslashes are not handled in any special way in a string literal prefixed with 'r'. So r"\n" is a two-character string containing '' and 'n', while "\n" is a one-character string containing a newline. Usually patterns will be expressed in Python code using this raw string notation.

https://docs.python.org/3/library/re.html

nicwest · 2024-12-01T16:08:58Z

heltour/tournament/models.py

@@ -732,7 +731,7 @@ def __str__(self):
        return self.account_username


-username_validator = RegexValidator('^[\w-]+$')
+username_validator = RegexValidator('^[\\w-]+$')


see above on regexp litrals

nicwest · 2024-12-01T16:11:33Z

heltour/tournament/signals.py

-do_pairings_published = Signal(providing_args=['round_id'])
-do_validate_registration = Signal(providing_args=['reg_id'])
-do_create_team_channel = Signal(providing_args=['team_ids'])
+do_generate_pairings = Signal() # providing_args=['round_id', 'overwrite']


delete comments, we have version control.

nicwest · 2024-12-01T16:14:32Z

heltour/tournament/tests/test_login.py

@@ -3,7 +3,8 @@
 from django.test import TestCase
 from unittest.mock import patch
 from heltour.tournament import oauth
-from .testutils import *
+from .testutils import *#


generally speaking it's worth being explicit about your imports. from a practical perspective it helps static analysis because when you have import * the program (it it's not like a LSP or something) really struggles to know what variables/functions etc are on the stack.

Additionally relative imports are the devil, prefere absolute imports if possible.

nicwest · 2024-12-01T16:19:23Z

heltour/tournament/tests/test_login.py

@@ -20,13 +21,18 @@ def test_encode_decode_state(self, *args):
    @patch('heltour.tournament.oauth._encode_state', return_value='encodedstate')
    def test_oauth_redirect(self, *args):
        response = self.client.get(league_url('team', 'login'))
-        expected_oauth_url = 'https://oauth.lichess.org/oauth/authorize' + \
+        url = re.sub("&code_challenge=[0-9A-z-]{43}", "", response.url)
+        expected_oauth_url = 'https://lichess.org/oauth' + \


Suggested change

expected_oauth_url = 'https://lichess.org/oauth' + \

expected_oauth_url = ('https://lichess.org/oauth'

'?response_type=code'

'&client_id=clientid'

'&redirect_uri=http://testserver/auth/lichess/'

'&scope=email:read%20challenge:read%20challenge:write'

'&code_challenge_method=S256'

'&state=encodedstate')

python will concat this strings for you.

I would also make an argument to use https://docs.python.org/3/library/urllib.parse.html#module-urllib.parse as you are looking at a URL. but not the end of the world

glbert-does · 2024-12-01T16:23:21Z

LGTM, a few minor cosmetic things @lakinwecker can we get this merged?

i'll fix the minor stuff on tuesday/wednesday.

lakinwecker · 2024-12-02T15:16:32Z

I trust you all more than I trust myself on this stuff at the moment. I won't have time to review it in depth, anytime soon. Do you need me to mash the merge button? Or does one of you have the perms to do that?

I can deploy whenever you are ready

nicwest · 2024-12-02T15:25:54Z

I ran into an error testing this locally so don't merge yet.

Django 4.1 upgraded the ManifestStaticFilesStorage method for collecting static files and that's playing havok with our mapless bootstrap files (I suspect that's the reason that the tests are using the more tolerant StaticFilesStorage).

ref: https://github.com/glbert-does/heltour/blob/70a1edcbec3923029412ad179967cc6e5e49097a/heltour/tournament/static/lib/css/bootstrap.min.css#L6

adding the missing map files appears to fix the problem locally for me.

glbert-does · 2024-12-02T16:16:07Z

i wonder why i did not have that local error.
do i understand this correctly that you're saying a line like the one you pointed to needs to be added to all css files that are missing them?
so e.g. heltour/tournament/static/lib/css/BootstrapXL.css, which does not have it currently
needs /*# sourceMappingURL=BootstrapXL.css.map */?

i will fix this tomorrow/day after tomorrow as well. also, i will try to see why i didn't have the error locally.

PS: lakin, you gave me the merge perm. but the only way for me to use it responsibly is to not use it.

nicwest · 2024-12-02T16:28:39Z

do i understand this correctly that you're saying a line like the one you pointed to needs to be added to all css files that are missing them?

no. I'm suggesting that some of the current files are missing maps for their minified content but are still referencing them. The old version of ManifestStaticFilesStorage was permissive of this, but the new version isn't.

I'm not sure what settings you are running locally but if you change the staticfiles storage to ManifestStaticFilesStorage and try python manage.py collectstatic that should produce the error I was seeing. off the top of my head it was complaining about no being able to find /lib/css/bootstrap.css.min.map or similar

nicwest · 2024-12-02T16:30:22Z

it's also entirely possible that I have broken something in my branch and I might be projecting :D

glbert-does · 2024-12-04T17:24:35Z

@nicwest fixed all the minor issues you commented about above.

i also tried to read up on the ManifestStaticFilesStorage. and i did create the map files. i understand more about static file storage now (easy, as opposed to zero before), but i won't pretend to fully comprehend why empty files would be needed. either way, the error is gone, at least for me locally.

nicwest · 2024-12-05T01:27:21Z

you can grab the files from here: https://stackpath.bootstrapcdn.com/bootstrap/<version>/css/<name of file>
https://github.com/glbert-does/heltour/blob/2d83b28015ea49240f94d481f56860c75077b6a8/heltour/tournament/static/lib/css/bootstrap-theme.min.css#L2C15-L2C20 the version is at the top of the file.

glbert-does · 2024-12-05T22:21:31Z

right. i added those map files, but this is some dark magic. locally, the empty files did not lead to an error for me already, so i am not convinced i fixed it.

i turned debug on and off again, and switched around some folders and STATIC*-settings, and in the end i did manage to break everything. doesn't seem related to those map files though, so i am still in the dark.

nicwest · 2024-12-15T21:55:29Z

you may need to to run poetry lock --no-update

glbert-does added 19 commits November 17, 2023 14:35

fix deprecation warnings

ab5328e

fix deprecated rexgexp

86345bd

fix one test, temporarily turn failing test off

57d4fd1

providing_args are documentational and are deprecated

a852a92

add migration that was not done for 3rd alt option

70d208e

remove install_cacheops()

548ba3c

default_app_config in __init__.py is deprecated

d9cd10c

migrate deprecated fields

361460a

conf.urls.url() is deprecated in favour of urls.re_path()

4f8aa65

change some urls to paths

5c5e931

change re_path to more readable path

0b49e75

ifequals is deprecated

13f282c

update recaptcha to version 4

2b14357

update removed django.utils.http functions

a02c11a

re-enable cacheops, move to django 4.2

9ce14d4

the app is called tournament, not heltour

f006834

disable cacheops for testing

89598e3

add ad-hoc replacement for deactivated test

5787737

enable cacheops in default settings

f3a368d

glbert-does mentioned this pull request Nov 23, 2023

cryptography requires higher version of pyopenssl #526

Closed

glbert-does added 3 commits November 24, 2023 15:05

fix django 5 deprecation warnings

5a5b9b0

fix broken url for webcal

ae22207

upgrade to python 3.9

70a1edc

nicwest approved these changes Dec 1, 2024

View reviewed changes

glbert-does added 4 commits December 4, 2024 17:35

add missing map files for ManifestStaticFilesStorage

1fa17df

use regex string literals instead of escaping

99987b8

remove superfluous comments

c45185d

be explicit about imports

2d83b28

fill map files

b57c6af

This was referenced Dec 10, 2024

Move to using docker for dependencies and deployments #537

Open

Ruff linting/formatting #543

Open

add helper for allowing static in debug mode

87dcf87

This was referenced Dec 22, 2024

implement zen mode #544

Open

more filters when requesting game metas #524

Open

Start games automatically #523

Open

only approved users need to link #546

Open

add a legend to the team standings and crosstable pages #547

Open

glbert-does mentioned this pull request Dec 29, 2024

redirect mod requests #548

Open

glbert-does mentioned this pull request Jan 10, 2025

remove captcha #551

Open

glbert-does mentioned this pull request Jan 22, 2025

start process of removing django-select2-forms #552

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

update django to 4.2 #527

update django to 4.2 #527

glbert-does commented Nov 23, 2023 •

edited

Loading

glbert-does commented Feb 7, 2024

nicwest left a comment

nicwest Dec 1, 2024

nicwest Dec 1, 2024

nicwest Dec 1, 2024

nicwest Dec 1, 2024

nicwest Dec 1, 2024 •

edited

Loading

glbert-does commented Dec 1, 2024

lakinwecker commented Dec 2, 2024

nicwest commented Dec 2, 2024 •

edited

Loading

glbert-does commented Dec 2, 2024

nicwest commented Dec 2, 2024 •

edited

Loading

nicwest commented Dec 2, 2024

glbert-does commented Dec 4, 2024 •

edited

Loading

nicwest commented Dec 5, 2024 •

edited

Loading

glbert-does commented Dec 5, 2024

nicwest commented Dec 15, 2024

	pgn = re.sub('\\[[^R]\\w+ ".*"\\]\n', '', pgn)
	pgn = re.sub(r'\[[^R]\w+ ".*"\]\n', '', pgn)

-        expected_oauth_url = 'https://lichess.org/oauth' + \
+        expected_oauth_url = ('https://lichess.org/oauth'
+                             '?response_type=code'
+                             '&client_id=clientid'
+                             '&redirect_uri=http://testserver/auth/lichess/'
+                             '&scope=email:read%20challenge:read%20challenge:write'
+                             '&code_challenge_method=S256'
+                             '&state=encodedstate')

update django to 4.2 #527

Are you sure you want to change the base?

update django to 4.2 #527

Conversation

glbert-does commented Nov 23, 2023 • edited Loading

glbert-does commented Feb 7, 2024

nicwest left a comment

Choose a reason for hiding this comment

nicwest Dec 1, 2024

Choose a reason for hiding this comment

nicwest Dec 1, 2024

Choose a reason for hiding this comment

nicwest Dec 1, 2024

Choose a reason for hiding this comment

nicwest Dec 1, 2024

Choose a reason for hiding this comment

nicwest Dec 1, 2024 • edited Loading

Choose a reason for hiding this comment

glbert-does commented Dec 1, 2024

lakinwecker commented Dec 2, 2024

nicwest commented Dec 2, 2024 • edited Loading

glbert-does commented Dec 2, 2024

nicwest commented Dec 2, 2024 • edited Loading

nicwest commented Dec 2, 2024

glbert-does commented Dec 4, 2024 • edited Loading

nicwest commented Dec 5, 2024 • edited Loading

glbert-does commented Dec 5, 2024

nicwest commented Dec 15, 2024

glbert-does commented Nov 23, 2023 •

edited

Loading

nicwest Dec 1, 2024 •

edited

Loading

nicwest commented Dec 2, 2024 •

edited

Loading

nicwest commented Dec 2, 2024 •

edited

Loading

glbert-does commented Dec 4, 2024 •

edited

Loading

nicwest commented Dec 5, 2024 •

edited

Loading