Branch: refs/heads/master Author: Enrico Tröger enrico.troeger@uvena.de Committer: Enrico Tröger enrico.troeger@uvena.de Date: Sun, 29 Jan 2023 15:28:49 UTC Commit: 11f7f45f2ddab0a7ae8b00c97ca53503064af610 https://github.com/geany/www.geany.org/commit/11f7f45f2ddab0a7ae8b00c97ca535...
Log Message: ----------- Upgrade to Mezzanine 6 and Django 4.1
Modified Paths: -------------- geany/settings.py latest_version/releases.py requirements.txt
Modified: geany/settings.py 9 lines changed, 2 insertions(+), 7 deletions(-) =================================================================== @@ -585,13 +585,8 @@ def skip_404_not_found(record): message='^mezzanine_pagedown.filters.custom needs to ensure that any untrusted inputs.*', category=FutureWarning, module='mezzanine.core.templatetags.mezzanine_tags', - lineno=481) -warnings.filterwarnings( - action='ignore', - message='^mezzanine_pagedown.filters.custom needs to ensure that any untrusted inputs.*', - category=FutureWarning, - module='mezzanine.core.templatetags.mezzanine_tags', - lineno=495) + lineno=494) +
################## # LOCAL SETTINGS #
Modified: latest_version/releases.py 23 lines changed, 16 insertions(+), 7 deletions(-) =================================================================== @@ -122,8 +122,10 @@ def _group_releases_by_type(self):
for filename in self._release_files: for release_type in release_types: - if release_types[release_type]['pattern'].match(filename): - self._release_files_by_version[release_type].append(filename) + match = release_types[release_type]['pattern'].match(filename) + if match: + version = ''.join([part for part in match.groups() if part]) + self._release_files_by_version[release_type].append((filename, version)) break
# ---------------------------------------------------------------------- @@ -141,15 +143,22 @@ def _factor_release_versions(self): # ---------------------------------------------------------------------- def _determine_latest_version(self, release_type): versions = self._release_files_by_version[release_type] - sorted_versions = sorted(versions, key=parse_version) + sorted_versions = sorted(versions, key=self._parse_version) release_types = self._get_release_types() try: latest_version = sorted_versions.pop() - logger.debug('Latest version found for "%s": %s', release_type, latest_version) + latest_version_filename, _ = latest_version + logger.debug('Latest version found for "%s": %s', release_type, latest_version_filename) except IndexError: fallback_filename = release_types[release_type]['fallback_filename'] - latest_version = fallback_filename.format(version=self._fallback_version) + latest_version_filename = fallback_filename.format(version=self._fallback_version) logger.debug( - 'Latest version found for "%s": %s (fallback)', release_type, latest_version) + 'Latest version found for "%s": %s (fallback)', + release_type, latest_version_filename)
- return latest_version + return latest_version_filename + + # ---------------------------------------------------------------------- + def _parse_version(self, version): + _, version_number = version + return parse_version(version_number)
Modified: requirements.txt 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,4 @@ -Mezzanine==5.* +Mezzanine==6.* babel mysqlclient django-clearcache
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).