From 3e0e909a89d7b6894a5a7da7f0b6b9f32df167fc Mon Sep 17 00:00:00 2001 From: Philippe MILINK Date: Sat, 28 Sep 2024 18:23:07 +0200 Subject: [PATCH 1/3] Masque la commande de lancement de Typesense avec `make run-search-engine` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Peut prêter à confusion puisque le message d'erreur est affiché même si le lancement a réussi. Fix #5262 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 59fc204670..4e95f718fb 100644 --- a/Makefile +++ b/Makefile @@ -102,7 +102,7 @@ zmd-stop: ## Stop the zmarkdown server ## ~ Search Engine run-search-engine: ## Run the search server - ./.local/typesense/typesense-server --data-dir=.local/typesense/typesense-data --api-key=xyz || echo 'No Typesense installed (you can add it locally with `./scripts/install_zds.sh +typesense-local`)' + @./.local/typesense/typesense-server --data-dir=.local/typesense/typesense-data --api-key=xyz || echo 'No Typesense installed (you can add it locally with `./scripts/install_zds.sh +typesense-local`)' index-all: ## Index the whole database in the search engine python manage.py search_engine_manager index_all From 6e446fdc9df22f8666a1eb75e0f9d150bc1bb7b1 Mon Sep 17 00:00:00 2001 From: Philippe MILINK Date: Sat, 28 Sep 2024 19:10:30 +0200 Subject: [PATCH 2/3] =?UTF-8?q?Ajoute=20le=20logo=20de=20Gandi=20sur=20la?= =?UTF-8?q?=20page=20des=20cr=C3=A9dits=20techniques?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit En attendant que la PR #6527 soit terminée. --- assets/images/brands/gandi.svg | 5 +++++ templates/pages/technologies.html | 13 +++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 assets/images/brands/gandi.svg diff --git a/assets/images/brands/gandi.svg b/assets/images/brands/gandi.svg new file mode 100644 index 0000000000..668ebe8dbf --- /dev/null +++ b/assets/images/brands/gandi.svg @@ -0,0 +1,5 @@ + + + + diff --git a/templates/pages/technologies.html b/templates/pages/technologies.html index 2719aaea6d..46622ef0b3 100644 --- a/templates/pages/technologies.html +++ b/templates/pages/technologies.html @@ -61,6 +61,19 @@

{% trans "Droits" %}

sous licence CC BY. {% endblocktrans %}

+ +

{% trans "Hébergement" %}

+ +

+ Gandi.net
+ {% blocktrans %} + + Gandi soutient {{ site_name }} + + dans ses projets et ambitions en fournissant ses solutions d'hébergement généreusement et en + relayant certaines de nos actualités. Merci ! + {% endblocktrans %} +

{% endif %} From 1f993295934c17fbfc4cca5080c6cfb74e5107ce Mon Sep 17 00:00:00 2001 From: Situphen Date: Mon, 30 Sep 2024 22:22:27 +0200 Subject: [PATCH 3/3] =?UTF-8?q?Mise=20=C3=A0=20jour=20des=20d=C3=A9pendanc?= =?UTF-8?q?es=20Python=20(#6650)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Mise à jour triviale des dépendances Python * Mise à jour de Gunicorn * Correction d'un test suite à la mise à jour de django_rest_framework django_rest_framework 3.15.0 a remplacé les OrderedDict par des dict puisque ceux-ci sont maintenant ordonnées depuis Python 3.6 cf. https://github.com/encode/django-rest-framework/pull/8964 --- .pre-commit-config.yaml | 6 +++--- requirements-dev.txt | 12 ++++++------ requirements-prod.txt | 6 +++--- requirements.txt | 28 ++++++++++++++-------------- zds/mp/api/tests.py | 1 - 5 files changed, 26 insertions(+), 27 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 383967d4ca..1e2bad94a8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,16 +1,16 @@ repos: - repo: https://github.com/asottile/pyupgrade - rev: v3.15.1 + rev: v3.17.0 hooks: - id: pyupgrade args: [--py39-plus] - repo: https://github.com/psf/black-pre-commit-mirror - rev: 24.2.0 # needs to be also updated in requirements-dev.txt + rev: 24.8.0 # needs to be also updated in requirements-dev.txt hooks: - id: black language_version: python3 - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.5.0 + rev: v4.6.0 hooks: - id: trailing-whitespace exclude_types: ["svg"] diff --git a/requirements-dev.txt b/requirements-dev.txt index 7f8bc21fd4..41a1bb673d 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,12 +1,12 @@ -r requirements.txt -black==24.2.0 # needs to be also updated in .pre-commit-config.yaml +black==24.8.0 # needs to be also updated in .pre-commit-config.yaml colorlog==6.8.2 -django-debug-toolbar==4.3.0 +django-debug-toolbar==4.4.6 django-extensions==3.2.3 -Faker==24.1.0 -pre-commit==3.6.2 -PyYAML==6.0.1 -selenium==4.18.1 +Faker==30.0.0 +pre-commit==3.8.0 +PyYAML==6.0.2 +selenium==4.25.0 Sphinx==7.2.6 sphinx-rtd-theme==2.0.0 diff --git a/requirements-prod.txt b/requirements-prod.txt index bc41ba250a..67249c8626 100644 --- a/requirements-prod.txt +++ b/requirements-prod.txt @@ -1,6 +1,6 @@ -r requirements.txt -gunicorn==21.2.0 +gunicorn==23.0.0 mysqlclient==2.2.4 -sentry-sdk==2.9.0 -ujson==5.9.0 +sentry-sdk==2.14.0 +ujson==5.10.0 diff --git a/requirements.txt b/requirements.txt index 12e87843ca..0bd0e6e7e7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,30 +1,30 @@ # Implicit dependencies (optional dependencies of dependencies) crispy-forms-bootstrap2==2024.1 -social-auth-app-django==5.4.0 +social-auth-app-django==5.4.2 # Explicit dependencies (references in code) beautifulsoup4==4.12.3 -django-crispy-forms==2.1 -django-model-utils==4.4.0 +django-crispy-forms==2.3 +django-model-utils==5.0.0 django-recaptcha==4.0.0 -Django==4.2.11 -easy-thumbnails[svg]==2.8.5 -factory-boy==3.3.0 +Django==4.2.16 +easy-thumbnails[svg]==2.10.0 +factory-boy==3.3.1 geoip2==4.8.0 -GitPython==3.1.42 +GitPython==3.1.43 homoglyphs==2.0.4 -lxml==5.1.0 -Pillow==10.2.0 +lxml==5.3.0 +Pillow==10.4.0 pymemcache==4.0.0 -requests==2.31.0 -typesense==0.19.0 +requests==2.32.3 +typesense==0.21.0 ua-parser==0.18.0 # Api dependencies -django-cors-headers==4.3.1 -django-filter==24.1 +django-cors-headers==4.4.0 +django-filter==24.3 django-oauth-toolkit==2.3.0 -djangorestframework==3.14.0 +djangorestframework==3.15.2 drf-extensions==0.7.1 dry-rest-permissions==0.1.10 drf-yasg==1.21.7 diff --git a/zds/mp/api/tests.py b/zds/mp/api/tests.py index ad6503dcb5..25b065d0b3 100644 --- a/zds/mp/api/tests.py +++ b/zds/mp/api/tests.py @@ -210,7 +210,6 @@ def test_expand_list_of_private_topics_for_author(self): response = self.client.get(reverse("api:mp:list") + "?expand=author") self.assertEqual(response.status_code, status.HTTP_200_OK) author = response.data.get("results")[0].get("author") - self.assertIsInstance(author, OrderedDict) self.assertEqual(author.get("username"), self.profile.user.username) self.assertEqual(author.get("avatar_url"), self.profile.get_avatar_url())