Merge branch 'main' into add-fa

Author: sepehr-rs

.github/CODEOWNERS

@@ -3,5 +3,5 @@
 
 # Additionally, notify Stan for docs things
 .github/workflows/docs-redirects.yml  @StanFromIreland @JacobCoffee
-salt/docs/*                           @StanFromIreland @JacobCoffee
-tests/docs-redirects/*                @StanFromIreland @JacobCoffee
+salt/docs/                            @StanFromIreland @JacobCoffee
+tests/docs-redirects/                 @StanFromIreland @JacobCoffee

salt/codespeed/config/codespeed.service.jinja

@@ -6,7 +6,7 @@ After=network.target
 Environment=LC_ALL=en_US.UTF-8
 Environment=LANG=en_US.UTF-8
 WorkingDirectory=/srv/codespeed/{{ instance }}/src
-ExecStart=/srv/codespeed/{{ instance }}/env/bin/gunicorn {{ wsgi_app }} -w 4 --bind unix:///var/run/codespeed/{{ instance }}.sock
+ExecStart=/srv/codespeed/{{ instance }}/env/bin/gunicorn {{ wsgi_app }} -w 4 --timeout 300 --bind unix:///var/run/codespeed/{{ instance }}.sock
 ExecReload=/bin/kill -HUP $MAINPID
 ExecStop = /bin/kill -s TERM $MAINPID
 Restart=on-failure

salt/codespeed/config/nginx.conf.jinja

@@ -33,6 +33,10 @@ server {
       proxy_set_header Host $http_host;
       proxy_redirect off;
 
+      # Result uploads insert thousands of rows and run well past the 60s default
+      proxy_read_timeout 300s;
+      proxy_send_timeout 300s;
+
       if (!-f $request_filename) {
           proxy_pass http://codespeed-{{ instance }};
           break;

salt/docs/config/nginx.docs-redirects.conf

@@ -8,7 +8,7 @@ location = / {
 }
 
 # Python 3 docs are the default at the root of each translation.
-location ~ ^/(bn-in|el|es|fa|fr|id|it|ja|ko|pl|pt-br|ro|sv|tr|uk|zh-cn|zh-tw)/$ {
+location ~ ^/(bn-in|de|el|es|fa|fr|id|it|ja|ko|pl|pt-br|ro|ru|sv|tr|uk|zh-cn|zh-tw)/$ {
     return 302 $scheme://$host/$1/3/;
 }
 
@@ -133,6 +133,9 @@ location ~ ^/([a-z-]*/)?(3|3.5|3.6|3.7|3.8|3.9|3.10)/library/_winreg.html$ {
 location ~ ^/([a-z-]*/)?(3|3.13|3.14)/library/(2to3|tkinter.tix).html$ {
     return 301 https://$host/$1$2/;
 }
+location ~ ^/([a-z-]*/)?(3|3.13|3.14|3.15)/library/(constants|exceptions|functions|stdtypes|threadsafety|time-complexity).html$ {
+    return 301 https://$host/$1$2/builtins/$3.html;
+}
 
 # Map /documenting to the devguide.
 location ~ ^/devguide/(.*)$ {
@@ -192,7 +195,7 @@ location ~ ^/((2|3)(\.[0-9]+)?|dev)/ {
     error_page 404 /$1/404.html;
     add_header Surrogate-Key en/$1 always;
 }
-location ~ ^/(bn-in|el|es|fa|fr|id|it|ja|ko|pl|pt-br|ro|tr|sv|uk|zh-cn|zh-tw)/((2|3)(\.[0-9]+)?|dev)/ {
+location ~ ^/(bn-in|de|el|es|fa|fr|id|it|ja|ko|pl|pt-br|ro|ru|tr|sv|uk|zh-cn|zh-tw)/((2|3)(\.[0-9]+)?|dev)/ {
     error_page 404 /$1/$2/404.html;
     add_header Surrogate-Key $1/$2 always;
 }

salt/docs/init.sls

@@ -87,6 +87,7 @@ docsbuild-no-html:
         /srv/docsbuild/venv/bin/python
         /srv/docsbuild/scripts/build_docs.py
         --select-output=no-html
+        --include-security-branches
     - user: docsbuild
     - minute: 7
     - hour: 6
@@ -102,6 +103,7 @@ docsbuild-only-html:
         /srv/docsbuild/venv/bin/python
         /srv/docsbuild/scripts/build_docs.py
         --select-output=only-html
+        --include-security-branches
     - user: docsbuild
     - minute: 42
     - hour: 4

tests/docs-redirects/specs/PEP-594.hurl

@@ -198,6 +198,21 @@ HTTP 301
 [Asserts]
 header "Location" == "https://localhost/ro/3.14/"
 
+GET {{host}}/ru/3/library/2to3.html
+HTTP 301
+[Asserts]
+header "Location" == "https://localhost/ru/3/"
+
+GET {{host}}/ru/3.13/library/2to3.html
+HTTP 301
+[Asserts]
+header "Location" == "https://localhost/ru/3.13/"
+
+GET {{host}}/ru/3.14/library/2to3.html
+HTTP 301
+[Asserts]
+header "Location" == "https://localhost/ru/3.14/"
+
 GET {{host}}/sv/3/library/2to3.html
 HTTP 301
 [Asserts]
@@ -470,6 +485,21 @@ HTTP 301
 [Asserts]
 header "Location" == "https://localhost/ro/3.14/"
 
+GET {{host}}/ru/3/library/tkinter.tix.html
+HTTP 301
+[Asserts]
+header "Location" == "https://localhost/ru/3/"
+
+GET {{host}}/ru/3.13/library/tkinter.tix.html
+HTTP 301
+[Asserts]
+header "Location" == "https://localhost/ru/3.13/"
+
+GET {{host}}/ru/3.14/library/tkinter.tix.html
+HTTP 301
+[Asserts]
+header "Location" == "https://localhost/ru/3.14/"
+
 GET {{host}}/sv/3/library/tkinter.tix.html
 HTTP 301
 [Asserts]

tests/docs-redirects/specs/default-root.hurl

@@ -68,6 +68,11 @@ HTTP 302
 [Asserts]
 header "Location" == "http://localhost/ro/3/"
 
+GET {{host}}/ru/
+HTTP 302
+[Asserts]
+header "Location" == "http://localhost/ru/3/"
+
 GET {{host}}/sv/
 HTTP 302
 [Asserts]

tests/docs-redirects/specs/surrogate-key.hurl

@@ -655,6 +655,36 @@ HTTP 404
 [Asserts]
 header "Surrogate-Key" == "ro/dev"
 
+GET {{host}}/ru/3/
+HTTP 404
+[Asserts]
+header "Surrogate-Key" == "ru/3"
+
+GET {{host}}/ru/3/about.html
+HTTP 404
+[Asserts]
+header "Surrogate-Key" == "ru/3"
+
+GET {{host}}/ru/3.14/
+HTTP 404
+[Asserts]
+header "Surrogate-Key" == "ru/3.14"
+
+GET {{host}}/ru/3.14/about.html
+HTTP 404
+[Asserts]
+header "Surrogate-Key" == "ru/3.14"
+
+GET {{host}}/ru/dev/
+HTTP 404
+[Asserts]
+header "Surrogate-Key" == "ru/dev"
+
+GET {{host}}/ru/dev/about.html
+HTTP 404
+[Asserts]
+header "Surrogate-Key" == "ru/dev"
+
 GET {{host}}/sv/3/
 HTTP 404
 [Asserts]