Merge branch 'dev' into patch-3

.github/workflows/ci.yml

@@ -7,8 +7,8 @@ on:
     - cron: "30 3 * * WED" # every Wednesday at 3:30 AM, only main branch
 
 env:
-  NODE_VERSION: "16" # needs to be also updated in .nvmrc
-  PYTHON_VERSION: "3.7"
+  NODE_VERSION: "18" # needs to be also updated in .nvmrc
+  PYTHON_VERSION: "3.9"
   MARIADB_VERSION: "10.4.10"
   COVERALLS_VERSION: "3.3.1" # check if Coverage needs to be also updated in requirements-ci.txt
   GECKODRIVER_VERSION: "0.33.0"

.nvmrc

@@ -1 +1,2 @@
-16
+18
+# needs to be also updated in .github/workflows/ci.yml

.pre-commit-config.yaml

@@ -1,11 +1,11 @@
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.2  # version 3.4.0 doesn't work with Python 3.7
+    rev: v3.13.0
     hooks:
     -   id: pyupgrade
-        args: [--py37-plus]
-  - repo: https://github.com/psf/black
-    rev: 23.3.0 # needs to be also updated in requirements-dev.txt
+        args: [--py39-plus]
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 23.9.1 # needs to be also updated in requirements-dev.txt
     hooks:
       - id: black
         language_version: python3

Makefile

@@ -55,6 +55,7 @@ clean-back: ## Remove Python bytecode files (*.pyc)
 	find . -name '*.pyc' -exec rm {} \;
 
 list-outdated-back: ## List outdated Python packages
+	@echo 'Info: You need to check `easy-thumbnails` version manually!'
 	@echo "Package                 Version   Latest    Type"
 	@echo "----------------------- --------- --------- -----"
 	@pip list --outdated | grep "`awk -F== '{ print $$1 }' requirements*.txt | tr -s '\n' '\n' | sort`"

doc/source/install/install-macos.rst

@@ -83,7 +83,7 @@ Pour vérifier, exécutez la commande suivante :
 
   python --version
 
-Si vous obtenez une version inférieure à Python 3.7 (et notamment si vous voyez
+Si vous obtenez une version inférieure à Python 3.9 (et notamment si vous voyez
 ``Python 2.7``), il vous faudra installer une version récente de Python avec
 Homebrew. Sinon, vous pouvez utiliser la version intégrée avec macOS de Python,
 mais vous devrez installer ``pip``.

package.json

@@ -25,7 +25,7 @@
   },
   "homepage": "https://github.com/zestedesavoir/zds-site",
   "dependencies": {
-    "autoprefixer": "10.4.14",
+    "autoprefixer": "10.4.16",
     "chart.js": "3.9.1",
     "chartjs-adapter-moment": "1.0.1",
     "cssnano": "6.0.1",
@@ -40,18 +40,18 @@
     "gulp-postcss": "9.0.1",
     "gulp-terser-js": "5.2.2",
     "gulp.spritesmith": "6.13.0",
-    "jquery": "3.7.0",
+    "jquery": "3.7.1",
     "moment": "2.29.4",
     "normalize.css": "8.0.1",
-    "postcss": "8.4.23"
+    "postcss": "8.4.31"
   },
   "devDependencies": {
     "david": "12.0.0",
-    "eslint": "8.41.0",
-    "eslint-config-standard": "17.0.0",
-    "eslint-plugin-import": "2.27.5",
-    "eslint-plugin-jsdoc": "44.2.5",
-    "eslint-plugin-n": "16.0.0",
+    "eslint": "8.50.0",
+    "eslint-config-standard": "17.1.0",
+    "eslint-plugin-import": "2.28.1",
+    "eslint-plugin-jsdoc": "46.8.2",
+    "eslint-plugin-n": "16.1.0",
     "eslint-plugin-promise": "6.1.1"
   },
   "browserslist": [

requirements-dev.txt

@@ -1,12 +1,12 @@
 -r requirements.txt
 
-black==23.3.0  # needs to be also updated in .pre-commit-config.yaml
+black==23.9.1  # needs to be also updated in .pre-commit-config.yaml
 colorlog==6.7.0
 django-debug-toolbar==3.8.1
 django-extensions==3.2.3
-Faker==18.13.0
-pre-commit==2.21.0
+Faker==19.6.2
+pre-commit==3.4.0
 PyYAML==6.0.1
 selenium==4.9.1
-Sphinx==5.3.0
+Sphinx==7.2.6
 sphinx-rtd-theme==1.3.0

requirements.txt

@@ -10,18 +10,18 @@ django-model-utils==4.3.1
 django-munin==0.2.1
 django-recaptcha==3.0.0
 Django==3.2.21
-easy-thumbnails[svg]==2.8.3
+easy-thumbnails[svg]==2.8.5
 factory-boy==3.3.0
 geoip2==4.7.0
 GitPython==3.1.37
 homoglyphs==2.0.4
 lxml==4.9.3
-Pillow==9.5.0
+Pillow==10.0.1
 pymemcache==4.0.0
 requests==2.31.0
 
 # Api dependencies
-django-cors-headers==4.1.0
+django-cors-headers==4.2.0
 django-filter==23.3
 django-oauth-toolkit==1.7.0
 djangorestframework==3.14.0

scripts/define_variable.sh

@@ -4,10 +4,14 @@ if [[ $ZDS_VENV == "" ]]; then
     ZDS_VENV="zdsenv"
 fi
 
+if [[ $ZDS_VENV_VERSION == "" ]]; then
+    ZDS_VENV_VERSION="20.24.5"
+fi
+
 ZDS_NODE_VERSION=$(cat $ZDSSITE_DIR/.nvmrc)
 
 if [[ $ZDS_NVM_VERSION == "" ]]; then
-    ZDS_NVM_VERSION="0.33.11"
+    ZDS_NVM_VERSION="0.39.5"
 fi
 
 if [[ $ZDS_ELASTIC_VERSION == "" ]]; then
@@ -19,7 +23,7 @@ if [[ $ZDS_LATEX_REPO == "" ]]; then
 fi
 
 if [[ $ZDS_JDK_VERSION == "" ]]; then
-    ZDS_JDK_VERSION="11.0.14.1"
+    ZDS_JDK_VERSION="11.0.20.1"
     # shellcheck disable=SC2034
     ZDS_JDK_REV="1"
 fi

scripts/dependencies/arch.txt

@@ -1,5 +1,5 @@
 #title=Arch
-#desc=Utilisation de pacman / Testé sur Arch
+#desc=Utilisation de pacman / Non testé sur les versions récentes
 #updatecmd=pacman -Syu --noconfirm
 #installcmd=pacman -S --noconfirm
 git

scripts/dependencies/debian.txt

@@ -1,5 +1,5 @@
 #title=Debian
-#desc=Utilisation de apt-get / Testé sur Debian Buster (10), Bullseye (11), Bookworm (12)
+#desc=Utilisation de apt-get / Testé sur Debian Bullseye (11), Bookworm (12)
 #updatecmd=apt-get -y update
 #installcmd=apt-get -y install
 git

scripts/dependencies/fedora.txt

@@ -1,5 +1,5 @@
 #title=Fedora
-#desc=Utilisation de dnf / Testé sur Fedora 29, 30
+#desc=Utilisation de dnf / Non testé sur les versions récentes
 #installcmd=dnf -y install
 git
 wget

scripts/dependencies/ubuntu.txt

@@ -1,5 +1,5 @@
 #title=Ubuntu
-#desc=Utilisation de apt-get / Testé sur : 18.04 LTS, 19.04, 20.04 LTS & Linux Mint 19
+#desc=Utilisation de apt-get / Testé sur : 22.04 LTS
 #updatecmd=apt-get -y update
 #installcmd=apt-get -y install
 git

scripts/install_zds.sh

@@ -147,8 +147,8 @@ if  ! $(_in "-virtualenv" $@) && ( $(_in "+virtualenv" $@) || $(_in "+base" $@)
             fi
         fi
 
-        print_info "* [+virtualenv] installing \`virtualenv 16.2.0\` with pip"
-        pip3 install --user virtualenv==16.2.0
+        print_info "* [+virtualenv] installing \`virtualenv $ZDS_VENV_VERSION\` with pip"
+        pip3 install --user virtualenv==$ZDS_VENV_VERSION
 
         print_info "* [+virtualenv] creating virtualenv"
         err=$(python3 -m venv $ZDS_VENV 3>&1 1>&2 2>&3 | sudo tee /dev/stderr)
@@ -172,7 +172,7 @@ fi
 if  ! $(_in "-node" $@) && ( $(_in "+node" $@) || $(_in "+base" $@) || $(_in "+full" $@) ); then
     print_info "* [+node] installing nvm (v$ZDS_NVM_VERSION) & node (v$ZDS_NODE_VERSION) & yarn" --bold
 
-    wget -qO- https://raw.githubusercontent.com/creationix/nvm/v${ZDS_NVM_VERSION}/install.sh | bash
+    wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v${ZDS_NVM_VERSION}/install.sh | bash
     if [[ $? == 0 ]]; then
 
         # load nvm

templates/misc/pagination.part.html

@@ -11,7 +11,7 @@
     {% endcaptureas %}
 
     <ul class="pagination pagination-{{ position }}">
-        {% ifnotequal nb 1 %}
+        {% if nb != 1 %}
             <li class="prev">
                 {% with prev=nb|add:-1 %}
                     <a href="{% append_query_params page=prev %}{{ full_anchor }}" class="ico-after arrow-left blue" rel="prev">
@@ -21,18 +21,18 @@
                     </a>
                 {% endwith %}
             </li>
-        {% endifnotequal %}
+        {% endif %}
 
 
         {% for page in pages %}
             {% if page %}
                 <li>
                     <a
-                        {% ifnotequal page nb %}
+                        {% if page != nb %}
                             href="{% append_query_params page=page %}{{ full_anchor }}"
                         {% else %}
                             class="current"
-                        {% endifnotequal %}
+                        {% endif %}
                         {% if page|add:-1 == nb %}
                             rel="next"
                         {% elif page|add:1 == nb %}

templates/misc/paginator.html

@@ -24,11 +24,11 @@
             {% if page_nb %}
                 <li>
                     <a
-                        {% ifnotequal page_nb page_obj.number %}
+                        {% if page_nb != page_obj.number %}
                             href="{% append_query_params page=page_nb %}{{ full_anchor }}"
                         {% else %}
                             class="current"
-                        {% endifnotequal %}
+                        {% endif %}
                         {% if page_nb|add:-1 == page_obj.number %}
                             rel="next"
                         {% elif page_nb|add:1 == page_obj.number %}