From patchwork Fri Oct 6 19:59:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 31792 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F655E9410A for ; Fri, 6 Oct 2023 19:59:28 +0000 (UTC) Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by mx.groups.io with SMTP id smtpd.web10.3924.1696622367604681169 for ; Fri, 06 Oct 2023 12:59:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ee6wT2fV; spf=pass (domain: gmail.com, ip: 209.85.215.170, mailfrom: ticotimo@gmail.com) Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-578d791dd91so1981400a12.0 for ; Fri, 06 Oct 2023 12:59:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696622367; x=1697227167; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=cPlVxZHcNpMooVL56Cd7cP6lUg7NjNNhUeXNvBnius0=; b=ee6wT2fV4ci6eCKRBk7eKJ+4UzfCe0GqVvWAg1hWc7bEI7h0ZTKBh3XcG2t7n4fZBg aJDwB5QwEGy26nMdF4l/AFTZWinWzThxNMUml52QuqxUoGwU2oGtdHGbsk7HOMoAgWBS U2EDEl1+rr4SV9jMC9eMc16d9pVffMf4YFU3cdS12RnEvqgTiw7W6KMkyAgjxHVuTxmM /82pbkOIhaH/EQJvFMuyMlkD9rOnjWQ2x3tD8kuP9opALwncLJG5u8GAptzbr78ZM3Ls H1D/Sd8935RlGzW2cRctNzO/s52eg0mvtG8r+rf8wq5hrjAsPX09K3vccvEbKic0q84Q ZUsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696622367; x=1697227167; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cPlVxZHcNpMooVL56Cd7cP6lUg7NjNNhUeXNvBnius0=; b=JedOmRDUo238gUAnGGanjPCsyrr2pIrU5G9grCmqwMTjJKTFbdB5LGe+6d+cPeQW9x 6QRfnA5nzrbmiI2jP+m6Tsv/G5/ts7HH+OWev1xSjyXoNJyx5ZRLK1matsuF61n3/GEb mBcQR5r0x/bE8HU9VAx7XCa16CSpzL2EkJQel4lxLUgtjquHXEQ+gbjadKp5lXTmtgJa JW+gAD4EuPpY0X8hJ+qwQEv6+2ZW4BGrlK4MEQkRxWqILlLaRJ72BVjstBwy3vvS+z5X R4lijHpgbM+407WDrKOdrj86Ex6Xq8mzpl4UORssDwUcHb/2O++n3ttTc4qiL6ylJDXa aESg== X-Gm-Message-State: AOJu0YyOneUDFELl69OnU2qiaHUUR551LSmNrLSQ2GIBcStfxFw6K+0u sOcgjJjva5KLLvqqAggsL4FuQdcQE5I= X-Google-Smtp-Source: AGHT+IEXu+0orat6SpGXr+WCdK7YcQb4Ht0pwfELp9dFicXKBLGu3AQG4K74yB9L3/sirtKpDAeldg== X-Received: by 2002:a17:90a:4f02:b0:273:f10c:b6d2 with SMTP id p2-20020a17090a4f0200b00273f10cb6d2mr10068907pjh.18.1696622366608; Fri, 06 Oct 2023 12:59:26 -0700 (PDT) Received: from chiron.hsd1.or.comcast.net ([2601:1c0:ca00:cea0:4ca0:e9cf:d643:bafd]) by smtp.gmail.com with ESMTPSA id 6-20020a17090a1a0600b00263dfe9b972sm6420971pjk.0.2023.10.06.12.59.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 12:59:26 -0700 (PDT) From: Tim Orling X-Google-Original-From: Tim Orling To: yocto@lists.yoctoproject.org Subject: [layerindex-web 01/10] requirements.txt: upgrade Django 3.2 -> 4.2 Date: Fri, 6 Oct 2023 12:59:04 -0700 Message-Id: <082f5aab793930ca046b85fbe1fb932c47a03f33.1696621423.git.tim.orling@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 06 Oct 2023 19:59:28 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/61265 Update to 4.2 LTS release https://docs.djangoproject.com/en/4.2/releases/4.2/ https://docs.djangoproject.com/en/4.1/releases/4.1/ https://docs.djangoproject.com/en/4.0/releases/4.0/ Signed-off-by: Tim Orling --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 18835b7..072c2f1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ beautifulsoup4==4.10.0 billiard==3.6.4.0 celery==5.2.3 confusable-homoglyphs==3.2.0 -Django>=3.2,<3.3 +Django>=4.2,<4.3 django-appconf==1.0.5 django-axes==5.31.0 django-bootstrap-pagination==1.7.1 From patchwork Fri Oct 6 19:59:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 31793 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F17AE9410C for ; Fri, 6 Oct 2023 19:59:38 +0000 (UTC) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by mx.groups.io with SMTP id smtpd.web10.3926.1696622369909636780 for ; Fri, 06 Oct 2023 12:59:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=hxq5KcuP; spf=pass (domain: gmail.com, ip: 209.85.216.52, mailfrom: ticotimo@gmail.com) Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-27777174297so1801148a91.3 for ; Fri, 06 Oct 2023 12:59:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696622369; x=1697227169; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=4rYJi+AvGeIiHWz79DKQXyhkLiXhEbTCdMNVp3nS4jQ=; b=hxq5KcuP4wRln5UHp5krES4/Y3kXIUeO11Nl54HkPIdoK77Qq3BKcx4U4DvOHgGKTt kGBtBnQnsFMc+wH8D8f1OraUsOm2saGaZxGfF7aZvrjMLLHsUMTc3Sti1g6oRKFraUnE 5FYVfQd2HDQG3994h+yKk5p/WBTkMAzKTapzuuY9vMsgfqKWrjjlsc/kTnS5asVzL9lJ n9t7D9EYd5JFbrUgeFoeAjoTPjbgRqjzqUcgBojUdMipelb8+0sZm0mSP4pCi8MUymif SUOjDl6kUC50Wisxk5dUoLOvf4yaANTizm+wW7Xz2LBmA8TTnHZI+Eh9LxEPMjfwPDW0 uEZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696622369; x=1697227169; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4rYJi+AvGeIiHWz79DKQXyhkLiXhEbTCdMNVp3nS4jQ=; b=wN7UjYKAOjoyOXews3srZyzVtBX8A80clZYGxDFMNtR4jkfkt/t4UZfskTLBc4Pevs tm1IbQsBKLeNNdmknM0bw+qIUA9Ez0+6v8flHxHDez/1HeXjn4wFyTHfjxKRM7nSISTB q/2K608Dmo4TxVXnMaDEdJMrEt+mW4IhvsHqWFHgj2+NoUACjH9Ms1k98s1BGlKitT5Y xJUdqA5yT/QNththllHv94yJEZ8RzdTvO6jsxu5GyQFzUZDZLaKZ+X47QCoZZEYWdVcm M90H2uCm5TaxoS55BLXvUJAoSwmnOW92hWMMu0dNo/4aJKaLj1bhMEmKbCOR4shsBZSS Tcfg== X-Gm-Message-State: AOJu0YwWQQK42ZjJCP/Skyxr08HHPk5eNVZvbaERqXGQsh6y4epcGtJ5 hF1yVWhgcK/u/vz47/ZiiCgeiPLZI/I= X-Google-Smtp-Source: AGHT+IHW740/KHuGXaro37q+zlA27ADXHlUvDnsiLAH6poCFuLN53DI6C5hjtuTK9xvkgUbL0gV+cQ== X-Received: by 2002:a17:90a:8b0f:b0:276:785f:7edd with SMTP id y15-20020a17090a8b0f00b00276785f7eddmr9407414pjn.25.1696622369029; Fri, 06 Oct 2023 12:59:29 -0700 (PDT) Received: from chiron.hsd1.or.comcast.net ([2601:1c0:ca00:cea0:4ca0:e9cf:d643:bafd]) by smtp.gmail.com with ESMTPSA id 6-20020a17090a1a0600b00263dfe9b972sm6420971pjk.0.2023.10.06.12.59.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 12:59:28 -0700 (PDT) From: Tim Orling X-Google-Original-From: Tim Orling To: yocto@lists.yoctoproject.org Subject: [layerindex-web 02/10] docker-compose.yml: bump mariadb from 10.3 to 10.4 Date: Fri, 6 Oct 2023 12:59:05 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 06 Oct 2023 19:59:38 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/61266 Django 4.2 requires a minimum of 10.4 https://docs.djangoproject.com/en/4.2/releases/4.2/#dropped-support-for-mariadb-10-3 Signed-off-by: Tim Orling --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2dfff41..e57f59d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: layersdb: - image: mariadb:10.3 + image: mariadb:10.4 command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --wait_timeout=28800 --max_allowed_packet=128M environment: - "MYSQL_DATABASE=layersdb" From patchwork Fri Oct 6 19:59:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 31794 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5216FE9410D for ; Fri, 6 Oct 2023 19:59:38 +0000 (UTC) Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by mx.groups.io with SMTP id smtpd.web11.4019.1696622371740939493 for ; Fri, 06 Oct 2023 12:59:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=hrNjXoML; spf=pass (domain: gmail.com, ip: 209.85.215.173, mailfrom: ticotimo@gmail.com) Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-578e33b6fb7so1796693a12.3 for ; Fri, 06 Oct 2023 12:59:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696622371; x=1697227171; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=U+nWfF0alIzEM2LPLkRis9qjzS8fH4Wtpvd7f2GyCcA=; b=hrNjXoMLge0MAvj9S/uPA2JftgbxBqvtPvNR2rOVuRuhdmTXDf2GM/gSqvm8Yjihff vEo15ePWygh3HSKGPThnK/EdDQxGX2wEEAs/n5qbd52fSlnhlw6U4oxbJSkLZ+tmzlIe FPtD6itTE/E48GupTSzBCb+Um1iN/bb1caFKSKQ6U4eo8ScDwLthRDdi8PXbH9lP5PMx JfDCAZRRbUVW73+GAe1Jr6RpCpLANqmoAOI1yIiys3+jBvlMBr5uFZ7v9hks7/x+XAjf zaxsFJwlxnY92efmmOTE6sJIIxOOJ9FY7/ojx+wjy2R2BJbTZ7SmgMPK2qFu1m3GRx2T Agow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696622371; x=1697227171; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=U+nWfF0alIzEM2LPLkRis9qjzS8fH4Wtpvd7f2GyCcA=; b=FaEZjBxe77ny2dV39VzK36WVUkzAi8/eh2glNFSf3XCe6jLGsDeF1mtvAG2lxLe11Y 8NDTus168J1DMROhdb39N+5VIUyyqFbODgT8HAhJwo2N6n5cF1b/bvK7LR1vfdJ9FpSG 8uq8u2YjJ9YVBi0W3847OgPo+GdSJs5EgYy4oiAwrRhupHKeUYv7Rxt3t9o5Wn2urR2b v9fOMdjC9KzBq4xwKMb02cSsAczuZUjvjnBRT1DdZr82q7hV1pP05cu8YJuBxKt2KHrt SZE6dB4ztg9Hi1siC21WPjF7Wt8uLN+kYdtBLCObv/1rlyBRSWiGhVsEv1mHYZ52P2Uy Cbvg== X-Gm-Message-State: AOJu0YwJ6Wjf2IMMHPpRVYLWYHGyXgQFp03Fp355OZedz8r52FYNymg1 OXBv10Ov5Ju2Gu/5RGkTKXd1PUR8QQM= X-Google-Smtp-Source: AGHT+IFM1zu23a0sv5glxvNJFmnnmtgKt+mpHmiNyLDwR9aRmpSNtNDNyx/wY4aSXX11NZsm3Q+2Pg== X-Received: by 2002:a17:90b:3b49:b0:26f:c6d5:3cd4 with SMTP id ot9-20020a17090b3b4900b0026fc6d53cd4mr9072946pjb.43.1696622370845; Fri, 06 Oct 2023 12:59:30 -0700 (PDT) Received: from chiron.hsd1.or.comcast.net ([2601:1c0:ca00:cea0:4ca0:e9cf:d643:bafd]) by smtp.gmail.com with ESMTPSA id 6-20020a17090a1a0600b00263dfe9b972sm6420971pjk.0.2023.10.06.12.59.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 12:59:30 -0700 (PDT) From: Tim Orling X-Google-Original-From: Tim Orling To: yocto@lists.yoctoproject.org Subject: [layerindex-web 03/10] Drop django-bootstrap-pagination: incompatible Date: Fri, 6 Oct 2023 12:59:06 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 06 Oct 2023 19:59:38 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/61267 Upstream django-bootstrap-pagination is no longer maintained and is incompatible with Django 4.x. https://github.com/staticdev/django-pagination-bootstrap was archived on June 26, 2023. ugettext was removed in Django 4.0: https://docs.djangoproject.com/en/4.2/releases/4.0/#features-removed-in-4-0 Signed-off-by: Tim Orling --- docker/settings.py | 1 - requirements.txt | 1 - settings.py | 1 - 3 files changed, 3 deletions(-) diff --git a/docker/settings.py b/docker/settings.py index a3f007d..a73178c 100644 --- a/docker/settings.py +++ b/docker/settings.py @@ -161,7 +161,6 @@ INSTALLED_APPS = ( 'axes', 'rest_framework', 'corsheaders', - 'bootstrap_pagination', ) AUTHENTICATION_BACKENDS = [ diff --git a/requirements.txt b/requirements.txt index 072c2f1..40f696c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,6 @@ confusable-homoglyphs==3.2.0 Django>=4.2,<4.3 django-appconf==1.0.5 django-axes==5.31.0 -django-bootstrap-pagination==1.7.1 django-cors-headers==3.11.0 django-ipware==4.0.2 django-ranged-response==0.2.0 diff --git a/settings.py b/settings.py index a69eb53..fa303b1 100644 --- a/settings.py +++ b/settings.py @@ -161,7 +161,6 @@ INSTALLED_APPS = ( 'axes', 'rest_framework', 'corsheaders', - 'bootstrap_pagination', ) AUTHENTICATION_BACKENDS = [ From patchwork Fri Oct 6 19:59:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 31796 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D725E9410F for ; Fri, 6 Oct 2023 19:59:38 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web11.4021.1696622373169265980 for ; Fri, 06 Oct 2023 12:59:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ZmgOQQN3; spf=pass (domain: gmail.com, ip: 209.85.216.50, mailfrom: ticotimo@gmail.com) Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-278fde50024so2875646a91.1 for ; Fri, 06 Oct 2023 12:59:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696622372; x=1697227172; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=LpjPR8HsYV74zCB9XFevMhgm6mF+eiH2vIum7Qzp2t8=; b=ZmgOQQN3gsPbaluEztxaTCFU3Oaos4WNMA/cod8PxOJ3wmZgPg37N1OsiWKVWSXaRP lp+Ss0dcfshRMO7sjL9Ljz8VIXWPMncZ8y579ugxpmP6wBslnRL3u6TxyznhQPRGPZHI uCJ79P690BGDjGjezGm9LHfxicng7ZSqMVc8CwPtLYI31BKpRqrMw6NFuIECJ20oWQ5E NeNxMG/vT64Tvqp2bJJFDGgHs+AySEg5E56GNHcY1mTLa+TtEZI5uyGvnUnMJm4esZdh zd0FVV6W1DaAdlyRpSTuRv8wwnETK7RGhAmWR2qvFCb1GR8ZCSdmIWolhLgS/fRkgEof +cQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696622372; x=1697227172; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LpjPR8HsYV74zCB9XFevMhgm6mF+eiH2vIum7Qzp2t8=; b=DLvnTgQ0WuGjM7TH7tdSYlJ3noQJR9vy4SnImV5364lBpfeR8D6zELXzMJ8h1Q5weD dMsGEJHdzVwfX/YMVRo7zLNMZAGOc+SxjyI1Cxd6roqvKNzAcqpYF16tZTvUF1TINqJc IC3nwqC9WJqVCUgPKxQgn5/Ru2Pe2Qhf3LKDe4J0FSWV2KhcoIeDRkc7ZqBRoJfbYGTi xglre3Bvwxom2unfzxTgVZWH7MUFkGzs7mIT4KRI84nmaLDrh/7xuWAKxN7clDlmLZFT I/T56wquRHYaZlJRAk4lmxl10fNsCIaKcn4JvCiFjhxW79rFgo1UK9qXaPStJqAD24qG /H2w== X-Gm-Message-State: AOJu0YxO0ph23OGyZDmpuZozsoU5c/5kAiLCMkGkFs0Km6lx3EB74fBJ 75kGY/zMumCJgXJO7OfoBEgZ4qBPyLo= X-Google-Smtp-Source: AGHT+IFZOUe/w7Ji07soSDtMoCrfXfOjeLibvSSBVlQqB3yJtDE3RoXgKDbMsDo7cgTLvKeYq9TPAw== X-Received: by 2002:a17:90a:b785:b0:274:7db1:f50f with SMTP id m5-20020a17090ab78500b002747db1f50fmr10119272pjr.15.1696622372260; Fri, 06 Oct 2023 12:59:32 -0700 (PDT) Received: from chiron.hsd1.or.comcast.net ([2601:1c0:ca00:cea0:4ca0:e9cf:d643:bafd]) by smtp.gmail.com with ESMTPSA id 6-20020a17090a1a0600b00263dfe9b972sm6420971pjk.0.2023.10.06.12.59.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 12:59:31 -0700 (PDT) From: Tim Orling X-Google-Original-From: Tim Orling To: yocto@lists.yoctoproject.org Subject: [layerindex-web 04/10] bootstrap_pagination: disable via comment Date: Fri, 6 Oct 2023 12:59:07 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 06 Oct 2023 19:59:38 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/61268 Wrap the is_pagination usage of bootstrap_pagination with comment/endcomment to avoid incompatible module. We will need to re-write the pagination code. Signed-off-by: Tim Orling --- templates/layerindex/bulkchangesearch.html | 2 ++ templates/layerindex/classes.html | 2 ++ templates/layerindex/classicrecipes.html | 2 ++ templates/layerindex/distros.html | 2 ++ templates/layerindex/history.html | 2 ++ templates/layerindex/layers.html | 2 ++ templates/layerindex/machines.html | 2 ++ templates/layerindex/recipes.html | 2 ++ templates/layerindex/reviewlist.html | 2 ++ templates/layerindex/updatelist.html | 2 ++ 10 files changed, 20 insertions(+) diff --git a/templates/layerindex/bulkchangesearch.html b/templates/layerindex/bulkchangesearch.html index 7f6b8c9..e8d6bd8 100644 --- a/templates/layerindex/bulkchangesearch.html +++ b/templates/layerindex/bulkchangesearch.html @@ -90,10 +90,12 @@ {% if is_paginated %} + {% comment %} {% load bootstrap_pagination %}
{% bootstrap_paginate page_obj range=10 show_prev_next="false" show_first_last="true" %}
+ {% endcomment %} {% endif %} {% else %} {% if searched %} diff --git a/templates/layerindex/classes.html b/templates/layerindex/classes.html index bd3b67d..bc3d0ac 100644 --- a/templates/layerindex/classes.html +++ b/templates/layerindex/classes.html @@ -62,10 +62,12 @@ {% if is_paginated %} + {% comment %} {% load bootstrap_pagination %}
{% bootstrap_paginate page_obj range=10 show_prev_next="false" show_first_last="true" %}
+ {% endcomment %} {% endif %} {% else %} {% if search_keyword %} diff --git a/templates/layerindex/classicrecipes.html b/templates/layerindex/classicrecipes.html index deedbbb..cf911a5 100644 --- a/templates/layerindex/classicrecipes.html +++ b/templates/layerindex/classicrecipes.html @@ -287,10 +287,12 @@ {% if is_paginated %} + {% comment %} {% load bootstrap_pagination %}
{% bootstrap_paginate page_obj range=10 show_prev_next="false" show_first_last="true" %}
+ {% endcomment %} {% endif %} {% else %} {% if searched %} diff --git a/templates/layerindex/distros.html b/templates/layerindex/distros.html index 549257b..0c1b276 100644 --- a/templates/layerindex/distros.html +++ b/templates/layerindex/distros.html @@ -65,10 +65,12 @@ {% if is_paginated %} + {% comment %} {% load bootstrap_pagination %}
{% bootstrap_paginate page_obj range=10 show_prev_next="false" show_first_last="true" %}
+ {% endcomment %} {% endif %} {% else %} {% if search_keyword %} diff --git a/templates/layerindex/history.html b/templates/layerindex/history.html index 3c80d92..9ae4431 100644 --- a/templates/layerindex/history.html +++ b/templates/layerindex/history.html @@ -60,10 +60,12 @@ {% if is_paginated %} + {% comment %} {% load bootstrap_pagination %}
{% bootstrap_paginate page_obj range=10 show_prev_next="false" show_first_last="true" %}
+ {% endcomment %} {% endif %} diff --git a/templates/layerindex/layers.html b/templates/layerindex/layers.html index 3e6a4b3..ae9befb 100644 --- a/templates/layerindex/layers.html +++ b/templates/layerindex/layers.html @@ -105,10 +105,12 @@ {% if is_paginated %} + {% comment %} {% load bootstrap_pagination %}
{% bootstrap_paginate page_obj range=10 show_prev_next="false" show_first_last="true" %}
+ {% endcomment %} {% endif %} {% else %}

No matching layers in database.

diff --git a/templates/layerindex/machines.html b/templates/layerindex/machines.html index ebbc158..685506d 100644 --- a/templates/layerindex/machines.html +++ b/templates/layerindex/machines.html @@ -64,10 +64,12 @@ {% if is_paginated %} + {% comment %} {% load bootstrap_pagination %}
{% bootstrap_paginate page_obj range=10 show_prev_next="false" show_first_last="true" %}
+ {% endcomment %} {% endif %} {% else %} {% if search_keyword %} diff --git a/templates/layerindex/recipes.html b/templates/layerindex/recipes.html index a1878fa..9c15e6c 100644 --- a/templates/layerindex/recipes.html +++ b/templates/layerindex/recipes.html @@ -90,10 +90,12 @@ {% if is_paginated %} + {% comment %} {% load bootstrap_pagination %}
{% bootstrap_paginate page_obj range=10 show_prev_next="false" show_first_last="true" %}
+ {% endcomment %} {% endif %} {% else %} {% if search_keyword %} diff --git a/templates/layerindex/reviewlist.html b/templates/layerindex/reviewlist.html index f72787a..18e0d78 100644 --- a/templates/layerindex/reviewlist.html +++ b/templates/layerindex/reviewlist.html @@ -69,10 +69,12 @@ {% if is_paginated %} + {% comment %} {% load bootstrap_pagination %}
{% bootstrap_paginate page_obj range=10 show_prev_next="false" show_first_last="true" %}
+ {% endcomment %} {% endif %} {% else %}

No unpublished layers to review.

diff --git a/templates/layerindex/updatelist.html b/templates/layerindex/updatelist.html index f4f786a..b68a860 100644 --- a/templates/layerindex/updatelist.html +++ b/templates/layerindex/updatelist.html @@ -54,10 +54,12 @@ {% if is_paginated %} +{% comment %} {% load bootstrap_pagination %}
{% bootstrap_paginate page_obj range=10 show_prev_next="false" show_first_last="true" %}
+{% endcomment %} {% endif %} {% endautoescape %} From patchwork Fri Oct 6 19:59:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 31798 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 652C7E94111 for ; Fri, 6 Oct 2023 19:59:38 +0000 (UTC) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mx.groups.io with SMTP id smtpd.web11.4023.1696622375053338394 for ; Fri, 06 Oct 2023 12:59:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=OyEDyOw8; spf=pass (domain: gmail.com, ip: 209.85.216.47, mailfrom: ticotimo@gmail.com) Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-27763c2c22eso1839142a91.3 for ; Fri, 06 Oct 2023 12:59:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696622374; x=1697227174; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=LohC1t8q4Nt3nBN204Xv5pb6BpDLd2lwc6KUCz9QiLE=; b=OyEDyOw8vri9h3hOVvpnioW5/k+qdzo4u5tqpG2yfSCbk0ADLDefGG+cWt7IguzYt+ 40pMfE/pBXDHRHD6hex4M7Wck19L9zkTPFUv0uCr8NavzYqOBKrDNVzIAYwJMDdA99tQ VeH5MK/dpfJrON45V5Dj3wrWU5kffDzrrfOIMHy3IET3sNscVKXuO9M+yBX7QE/6DYzo +eF7TSVmDS69TuENzc0QtBgP74jt9eqiMTjuXmq94HwjYP8VCWOT1CmbQn3nIGxtX7ht Q3Mh3/u7zMbVjDJMOoAITmFTOS10b2198ImVvCUlcqsq4DOtboRJjTn6fOk859P3/rJu pUFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696622374; x=1697227174; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LohC1t8q4Nt3nBN204Xv5pb6BpDLd2lwc6KUCz9QiLE=; b=pkAdbTcONJlRTqe3M1Dt/ZpeQR/gEBleatsYzOe/xkwHIP0NaD6UCh3Zy20/LXd8wX Vv3SoofYA0Q0mribNkHtvmzIiENeodZ5FKnt+gERVKdfCwo6d1HKblf5xpmcL080fJIr qc1yHWkrwIz9lfvyuoY2pU4uwM4pWxdKeuYie4q619H/3wUw4qqufMDXwBlXQ/qYXijO SniWEyB2610IkuXpJtpnt52HHbfWcse3nsXW7m3q4KkdckrxagskddqniL/oE5cxnY2+ AgN3A852hJaehiI1u/Cv6fElORC+oCYJRSYkCCNi22ZJ+uufPUdZZn2V5w16Qjrx1UFM gGmw== X-Gm-Message-State: AOJu0YxDqYcGd6OqrtqKB6OHkugi2midmuwUoAwzRRbvKqjLshZ+Penp 7IViH0YlGHGVrfRVIHlAoKy/O2pvwNc= X-Google-Smtp-Source: AGHT+IGy5WFuqIUaw5RZ/vcsi0WJ12VOdue09pz4N64sX3uQrLscYiw5zsCeD1W5CncnyEWv5kLYOw== X-Received: by 2002:a17:90b:3686:b0:279:13c3:6b21 with SMTP id mj6-20020a17090b368600b0027913c36b21mr8868801pjb.9.1696622373719; Fri, 06 Oct 2023 12:59:33 -0700 (PDT) Received: from chiron.hsd1.or.comcast.net ([2601:1c0:ca00:cea0:4ca0:e9cf:d643:bafd]) by smtp.gmail.com with ESMTPSA id 6-20020a17090a1a0600b00263dfe9b972sm6420971pjk.0.2023.10.06.12.59.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 12:59:33 -0700 (PDT) From: Tim Orling X-Google-Original-From: Tim Orling To: yocto@lists.yoctoproject.org Subject: [layerindex-web 05/10] Refactor usage of django.conf.urls Date: Fri, 6 Oct 2023 12:59:08 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 06 Oct 2023 19:59:38 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/61269 django.conf.urls.url() was removed in Django 4.0: https://docs.djangoproject.com/en/4.2/releases/4.0/#features-removed-in-4-0 Replace all usage with django.urls.re_path() Replace all django.conf.urls imports with equivalent django.urls modules Signed-off-by: Tim Orling --- layerindex/urls.py | 108 +++++++++++++++++++------------------- layerindex/urls_branch.py | 25 +++++---- rrs/urls.py | 16 +++--- urls.py | 31 ++++++----- 4 files changed, 88 insertions(+), 92 deletions(-) diff --git a/layerindex/urls.py b/layerindex/urls.py index 82af699..cee3d2a 100644 --- a/layerindex/urls.py +++ b/layerindex/urls.py @@ -6,10 +6,9 @@ # # SPDX-License-Identifier: MIT -from django.conf.urls import * from django.views.generic import TemplateView, DetailView, ListView, RedirectView from django.views.defaults import page_not_found -from django.urls import reverse_lazy +from django.urls import include, re_path, reverse_lazy from layerindex.views import LayerListView, LayerReviewListView, LayerReviewDetailView, RecipeSearchView, \ MachineSearchView, LayerDetailView, edit_layer_view, delete_layer_view, edit_layernote_view, delete_layernote_view, \ HistoryListView, EditProfileFormView, AdvancedRecipeSearchView, BulkChangeView, BulkChangeSearchView, \ @@ -21,7 +20,6 @@ from layerindex.views import LayerListView, LayerReviewListView, LayerReviewDeta from layerindex.models import LayerItem, Recipe, RecipeChangeset from rest_framework import routers from . import restviews -from django.conf.urls import include router = routers.DefaultRouter() router.register(r'branches', restviews.BranchViewSet) @@ -40,174 +38,174 @@ router.register(r'appends', restviews.AppendViewSet) router.register(r'incFiles', restviews.IncFileViewSet) urlpatterns = [ - url(r'^$', + re_path(r'^$', RedirectView.as_view(url=reverse_lazy('layer_list', args=('master',)), permanent=False), name='frontpage'), - url(r'^api/', include(router.urls)), + re_path(r'^api/', include(router.urls)), - url(r'^layers/$', + re_path(r'^layers/$', RedirectView.as_view(url=reverse_lazy('layer_list', args=('master',)), permanent=False)), - url(r'^layer/(?P[-\w]+)/$', + re_path(r'^layer/(?P[-\w]+)/$', RedirectParamsView.as_view(permanent=False), {'redirect_name': 'layer_item', 'branch': 'master'}), - url(r'^recipes/$', + re_path(r'^recipes/$', RedirectView.as_view(url=reverse_lazy('recipe_search', args=('master',)), permanent=False)), - url(r'^machines/$', + re_path(r'^machines/$', RedirectView.as_view(url=reverse_lazy('machine_search', args=('master',)), permanent=False)), - url(r'^distros/$', + re_path(r'^distros/$', RedirectView.as_view(url=reverse_lazy('distro_search', args=('master',)), permanent=False)), - url(r'^classes/$', + re_path(r'^classes/$', RedirectView.as_view(url=reverse_lazy('class_search', args=('master',)), permanent=False)), - url(r'^submit/$', edit_layer_view, {'template_name': 'layerindex/submitlayer.html'}, name="submit_layer"), - url(r'^submit/thanks/$', + re_path(r'^submit/$', edit_layer_view, {'template_name': 'layerindex/submitlayer.html'}, name="submit_layer"), + re_path(r'^submit/thanks/$', TemplateView.as_view( template_name='layerindex/submitthanks.html'), name="submit_layer_thanks"), - url(r'^review/$', + re_path(r'^review/$', LayerReviewListView.as_view( template_name='layerindex/reviewlist.html'), name='layer_list_review'), - url(r'^review/(?P[-\w]+)/$', + re_path(r'^review/(?P[-\w]+)/$', LayerReviewDetailView.as_view( template_name='layerindex/reviewdetail.html'), name='layer_review'), - url(r'^layer/(?P[-\w]+)/addnote/$', + re_path(r'^layer/(?P[-\w]+)/addnote/$', edit_layernote_view, {'template_name': 'layerindex/editlayernote.html'}, name="add_layernote"), - url(r'^layer/(?P[-\w]+)/editnote/(?P[-\w]+)/$', + re_path(r'^layer/(?P[-\w]+)/editnote/(?P[-\w]+)/$', edit_layernote_view, {'template_name': 'layerindex/editlayernote.html'}, name="edit_layernote"), - url(r'^layer/(?P[-\w]+)/deletenote/(?P[-\w]+)/$', + re_path(r'^layer/(?P[-\w]+)/deletenote/(?P[-\w]+)/$', delete_layernote_view, {'template_name': 'layerindex/deleteconfirm.html'}, name="delete_layernote"), - url(r'^layer/(?P[-\w]+)/delete/$', + re_path(r'^layer/(?P[-\w]+)/delete/$', delete_layer_view, {'template_name': 'layerindex/deleteconfirm.html'}, name="delete_layer"), - url(r'^recipe/(?P[-\w]+)/$', + re_path(r'^recipe/(?P[-\w]+)/$', RecipeDetailView.as_view( template_name='layerindex/recipedetail.html'), name='recipe'), - url(r'^layer/(?P[-\w]+)/publish/$', publish_view, name="publish"), - url(r'^layerupdate/(?P[-\w]+)/$', + re_path(r'^layer/(?P[-\w]+)/publish/$', publish_view, name="publish"), + re_path(r'^layerupdate/(?P[-\w]+)/$', LayerUpdateDetailView.as_view( template_name='layerindex/layerupdate.html'), name='layerupdate'), - url(r'^bulkchange/$', + re_path(r'^bulkchange/$', BulkChangeView.as_view( template_name='layerindex/bulkchange.html'), name="bulk_change"), - url(r'^bulkchange/(?P\d+)/search/$', + re_path(r'^bulkchange/(?P\d+)/search/$', BulkChangeSearchView.as_view( template_name='layerindex/bulkchangesearch.html'), name="bulk_change_search"), - url(r'^bulkchange/(?P\d+)/edit/$', + re_path(r'^bulkchange/(?P\d+)/edit/$', bulk_change_edit_view, {'template_name': 'layerindex/bulkchangeedit.html'}, name="bulk_change_edit"), - url(r'^bulkchange/(?P\d+)/review/$', + re_path(r'^bulkchange/(?P\d+)/review/$', DetailView.as_view( model=RecipeChangeset, context_object_name='changeset', template_name='layerindex/bulkchangereview.html'), name="bulk_change_review"), - url(r'^bulkchange/(?P\d+)/patches/$', + re_path(r'^bulkchange/(?P\d+)/patches/$', bulk_change_patch_view, name="bulk_change_patches"), - url(r'^bulkchange/(?P\d+)/delete/$', + re_path(r'^bulkchange/(?P\d+)/delete/$', BulkChangeDeleteView.as_view( template_name='layerindex/deleteconfirm.html'), name="bulk_change_delete"), - url(r'^branch/(?P[-.\w]+)/', + re_path(r'^branch/(?P[-.\w]+)/', include('layerindex.urls_branch')), - url(r'^updates/$', + re_path(r'^updates/$', UpdateListView.as_view( template_name='layerindex/updatelist.html'), name='update_list'), - url(r'^updates/(?P[-\w]+)/$', + re_path(r'^updates/(?P[-\w]+)/$', UpdateDetailView.as_view( template_name='layerindex/updatedetail.html'), name='update'), - url(r'^history/$', + re_path(r'^history/$', HistoryListView.as_view( template_name='layerindex/history.html'), name='history_list'), - url(r'^profile/$', + re_path(r'^profile/$', EditProfileFormView.as_view( template_name='layerindex/profile.html'), name="profile"), - url(r'^about/$', + re_path(r'^about/$', TemplateView.as_view( template_name='layerindex/about.html'), name="about"), - url(r'^stats/$', + re_path(r'^stats/$', StatsView.as_view( template_name='layerindex/stats.html'), name='stats'), - url(r'^oe-classic/$', + re_path(r'^oe-classic/$', RedirectView.as_view(url=reverse_lazy('classic_recipe_search'), permanent=False), name='classic'), - url(r'^oe-classic/recipes/$', + re_path(r'^oe-classic/recipes/$', RedirectView.as_view(url=reverse_lazy('comparison_recipe_search', kwargs={'branch': 'oe-classic'}), permanent=False), name='classic_recipe_search'), - url(r'^oe-classic/stats/$', + re_path(r'^oe-classic/stats/$', RedirectView.as_view(url=reverse_lazy('comparison_recipe_stats', kwargs={'branch': 'oe-classic'}), permanent=False), name='classic_recipe_stats'), - url(r'^oe-classic/recipe/(?P[-\w]+)/$', + re_path(r'^oe-classic/recipe/(?P[-\w]+)/$', ClassicRecipeDetailView.as_view( template_name='layerindex/classicrecipedetail.html'), name='classic_recipe'), - url(r'^comparison/recipes/(?P[-.\w]+)/$', + re_path(r'^comparison/recipes/(?P[-.\w]+)/$', ClassicRecipeSearchView.as_view( template_name='layerindex/classicrecipes.html'), name='comparison_recipe_search'), - url(r'^comparison/search-csv/(?P[-.\w]+)/$', + re_path(r'^comparison/search-csv/(?P[-.\w]+)/$', ClassicRecipeSearchView.as_view( template_name='layerindex/classicrecipes_csv.txt', paginate_by=0, content_type='text/csv; charset=utf-8'), name='comparison_recipe_search_csv'), - url(r'^comparison/stats/(?P[-.\w]+)/$', + re_path(r'^comparison/stats/(?P[-.\w]+)/$', ClassicRecipeStatsView.as_view( template_name='layerindex/classicstats.html'), name='comparison_recipe_stats'), - url(r'^comparison/recipe/(?P[-\w]+)/$', + re_path(r'^comparison/recipe/(?P[-\w]+)/$', ClassicRecipeDetailView.as_view( template_name='layerindex/classicrecipedetail.html'), name='comparison_recipe'), - url(r'^comparison/select/(?P[-\w]+)/$', + re_path(r'^comparison/select/(?P[-\w]+)/$', ComparisonRecipeSelectView.as_view( template_name='layerindex/comparisonrecipeselect.html'), name='comparison_select'), - url(r'^comparison/selectdetail/(?P[-\w]+)/(?P[-\w]+)/$', + re_path(r'^comparison/selectdetail/(?P[-\w]+)/(?P[-\w]+)/$', ComparisonRecipeSelectDetailView.as_view( template_name='layerindex/comparisonrecipeselectdetail.html'), name='comparison_select_detail'), - url(r'^email_test/$', + re_path(r'^email_test/$', email_test_view, name='email_test'), - url(r'^task/(?P[-\w]+)/$', + re_path(r'^task/(?P[-\w]+)/$', TaskStatusView.as_view( template_name='layerindex/task.html'), name='task_status'), - url(r'^tasklog/(?P[-\w]+)/$', + re_path(r'^tasklog/(?P[-\w]+)/$', task_log_view, name='task_log'), - url(r'^stoptask/(?P[-\w]+)/$', + re_path(r'^stoptask/(?P[-\w]+)/$', task_stop_view, name='task_stop'), - url(r'^branch_comparison/$', + re_path(r'^branch_comparison/$', BranchCompareView.as_view( template_name='layerindex/branchcompare.html'), name='branch_comparison'), - url(r'^branch_comparison_plain/$', + re_path(r'^branch_comparison_plain/$', BranchCompareView.as_view( content_type='text/plain; charset=utf-8', template_name='layerindex/branchcompare_plain.txt'), name='branch_comparison_plain'), - url(r'^recipe_deps/$', + re_path(r'^recipe_deps/$', RecipeDependenciesView.as_view( template_name='layerindex/recipedeps.html'), name='recipe_deps'), - url(r'^ajax/layerchecklist/(?P[-.\w]+)/$', + re_path(r'^ajax/layerchecklist/(?P[-.\w]+)/$', LayerCheckListView.as_view( template_name='layerindex/layerchecklist.html'), name='layer_checklist'), - url(r'^ajax/classchecklist/(?P[-.\w]+)/$', + re_path(r'^ajax/classchecklist/(?P[-.\w]+)/$', BBClassCheckListView.as_view( template_name='layerindex/classchecklist.html'), name='class_checklist'), - url(r'.*', page_not_found, kwargs={'exception': Exception("Page not Found")}) + re_path(r'.*', page_not_found, kwargs={'exception': Exception("Page not Found")}) ] diff --git a/layerindex/urls_branch.py b/layerindex/urls_branch.py index 86b8b77..6736f32 100644 --- a/layerindex/urls_branch.py +++ b/layerindex/urls_branch.py @@ -6,47 +6,46 @@ # # SPDX-License-Identifier: MIT -from django.conf.urls import * from django.views.defaults import page_not_found -from django.urls import reverse_lazy +from django.urls import include, re_path, reverse_lazy from layerindex.views import LayerListView, RecipeSearchView, MachineSearchView, DistroSearchView, ClassSearchView, LayerDetailView, edit_layer_view, delete_layer_view, edit_layernote_view, delete_layernote_view, RedirectParamsView, DuplicatesView, LayerUpdateDetailView, layer_export_recipes_csv_view, comparison_update_view urlpatterns = [ - url(r'^$', + re_path(r'^$', RedirectParamsView.as_view(permanent=False), {'redirect_name': 'layer_list'}), - url(r'^layers/$', + re_path(r'^layers/$', LayerListView.as_view( template_name='layerindex/layers.html'), name='layer_list'), - url(r'^layer/(?P[-\w]+)/$', + re_path(r'^layer/(?P[-\w]+)/$', LayerDetailView.as_view( template_name='layerindex/detail.html'), name='layer_item'), - url(r'^layer/(?P[-\w]+)/recipes/csv/$', + re_path(r'^layer/(?P[-\w]+)/recipes/csv/$', layer_export_recipes_csv_view, name='layer_export_recipes_csv'), - url(r'^recipes/$', + re_path(r'^recipes/$', RecipeSearchView.as_view( template_name='layerindex/recipes.html'), name='recipe_search'), - url(r'^machines/$', + re_path(r'^machines/$', MachineSearchView.as_view( template_name='layerindex/machines.html'), name='machine_search'), - url(r'^distros/$', + re_path(r'^distros/$', DistroSearchView.as_view( template_name='layerindex/distros.html'), name='distro_search'), - url(r'^classes/$', + re_path(r'^classes/$', ClassSearchView.as_view( template_name='layerindex/classes.html'), name='class_search'), - url(r'^edit/(?P[-\w]+)/$', edit_layer_view, {'template_name': 'layerindex/editlayer.html'}, name="edit_layer"), - url(r'^duplicates/$', + re_path(r'^edit/(?P[-\w]+)/$', edit_layer_view, {'template_name': 'layerindex/editlayer.html'}, name="edit_layer"), + re_path(r'^duplicates/$', DuplicatesView.as_view( template_name='layerindex/duplicates.html'), name='duplicates'), - url(r'^comparison_update/$', + re_path(r'^comparison_update/$', comparison_update_view, name='comparison_update'), ] diff --git a/rrs/urls.py b/rrs/urls.py index 63426a9..2adacce 100644 --- a/rrs/urls.py +++ b/rrs/urls.py @@ -6,7 +6,7 @@ # # SPDX-License-Identifier: MIT -from django.conf.urls import include, url +from django.urls import include, re_path from rrs.models import Release, Milestone from rrs.views import RecipeListView, recipes_report, RecipeDetailView, \ @@ -14,27 +14,27 @@ from rrs.views import RecipeListView, recipes_report, RecipeDetailView, \ MaintenanceStatsView urlpatterns = [ - url(r'^$', FrontPageRedirect.as_view(), + re_path(r'^$', FrontPageRedirect.as_view(), name='rrs_frontpage'), - url(r'^maintplan/(?P.*)/$', + re_path(r'^maintplan/(?P.*)/$', MaintenancePlanRedirect.as_view(), name='rrs_maintplan'), - url(r'^recipes/(?P.*)/(?P.*)/(?P.*)/$', + re_path(r'^recipes/(?P.*)/(?P.*)/(?P.*)/$', RecipeListView.as_view( template_name='rrs/recipes.html'), name='rrs_recipes'), - url(r'^recipesreport/(?P.*)/(?P.*)/(?P.*)/$', + re_path(r'^recipesreport/(?P.*)/(?P.*)/(?P.*)/$', recipes_report, name="rrs_recipesreport"), - url(r'^recipedetail/(?P.*)/(?P\d+)/$', + re_path(r'^recipedetail/(?P.*)/(?P\d+)/$', RecipeDetailView.as_view( template_name='rrs/recipedetail.html'), name='rrs_recipedetail'), - url(r'^maintainers/(?P.*)/(?P.*)/(?P.*)/$', + re_path(r'^maintainers/(?P.*)/(?P.*)/(?P.*)/$', MaintainerListView.as_view( template_name='rrs/maintainers.html'), name="rrs_maintainers"), - url(r'^stats/(?P.*)/(?P.*)/(?P.*)/$', + re_path(r'^stats/(?P.*)/(?P.*)/(?P.*)/$', MaintenanceStatsView.as_view( template_name='rrs/rrs_stats.html'), name="rrs_stats"), diff --git a/urls.py b/urls.py index 76f2f73..db94959 100644 --- a/urls.py +++ b/urls.py @@ -7,8 +7,7 @@ # # SPDX-License-Identifier: MIT -from django.conf.urls import include, url -from django.urls import reverse_lazy +from django.urls import include, re_path, reverse_lazy from django.views.generic import RedirectView, TemplateView from layerindex.auth_views import CaptchaRegistrationView, CaptchaPasswordResetView, delete_account_view, \ PasswordResetSecurityQuestions @@ -18,40 +17,40 @@ admin.autodiscover() import settings urlpatterns = [ - url(r'^layerindex/', include('layerindex.urls')), - url(r'^admin/', admin.site.urls), - url(r'^accounts/password_reset/$', + re_path(r'^layerindex/', include('layerindex.urls')), + re_path(r'^admin/', admin.site.urls), + re_path(r'^accounts/password_reset/$', CaptchaPasswordResetView.as_view( email_template_name='registration/password_reset_email.txt', success_url=reverse_lazy('password_reset_done')), name='password_reset'), - url(r'^accounts/register/$', CaptchaRegistrationView.as_view(), + re_path(r'^accounts/register/$', CaptchaRegistrationView.as_view(), name='django_registration_register'), - url(r'^accounts/delete/$', delete_account_view, + re_path(r'^accounts/delete/$', delete_account_view, {'template_name': 'layerindex/deleteaccount.html'}, name='delete_account'), - url(r'^accounts/reregister/$', TemplateView.as_view( + re_path(r'^accounts/reregister/$', TemplateView.as_view( template_name='registration/reregister.html'), name='reregister'), - url(r'^accounts/reset/(?P[0-9A-Za-z_\-]+)/(?P[0-9A-Za-z]{1,3}-[0-9A-Za-z]{1,20})/$', + re_path(r'^accounts/reset/(?P[0-9A-Za-z_\-]+)/(?P[0-9A-Za-z]{1,3}-[0-9A-Za-z]{1,20})/$', PasswordResetSecurityQuestions.as_view(), name='password_reset_confirm', ), - url(r'^accounts/reset/fail/$', TemplateView.as_view( + re_path(r'^accounts/reset/fail/$', TemplateView.as_view( template_name='registration/password_reset_fail.html'), name='password_reset_fail'), - url(r'^accounts/lockout/$', TemplateView.as_view( + re_path(r'^accounts/lockout/$', TemplateView.as_view( template_name='registration/account_lockout.html'), name='account_lockout'), - url(r'^accounts/', include('django_registration.backends.activation.urls')), - url(r'^accounts/', include('django.contrib.auth.urls')), - url(r'^captcha/', include('captcha.urls')), + re_path(r'^accounts/', include('django_registration.backends.activation.urls')), + re_path(r'^accounts/', include('django.contrib.auth.urls')), + re_path(r'^captcha/', include('captcha.urls')), ] if 'rrs' in settings.INSTALLED_APPS: urlpatterns += [ - url(r'^rrs/', include('rrs.urls')), + re_path(r'^rrs/', include('rrs.urls')), ] urlpatterns += [ - url(r'.*', RedirectView.as_view(url='/layerindex/', permanent=False)), + re_path(r'.*', RedirectView.as_view(url='/layerindex/', permanent=False)), ] From patchwork Fri Oct 6 19:59:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 31795 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6AF87E94113 for ; Fri, 6 Oct 2023 19:59:38 +0000 (UTC) Received: from mail-oi1-f169.google.com (mail-oi1-f169.google.com [209.85.167.169]) by mx.groups.io with SMTP id smtpd.web11.4024.1696622376420364330 for ; Fri, 06 Oct 2023 12:59:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=jm1QoMWy; spf=pass (domain: gmail.com, ip: 209.85.167.169, mailfrom: ticotimo@gmail.com) Received: by mail-oi1-f169.google.com with SMTP id 5614622812f47-3ae2896974bso1595173b6e.0 for ; Fri, 06 Oct 2023 12:59:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696622375; x=1697227175; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=9ARpLZoY7G6kjk0d6PN5ZkwSFj6+JUcxMc8vCi1seIs=; b=jm1QoMWyO3YLTOfKd4haCpovRMW/mQcWrdOpZm6pF3xIoE3bvk40vrGxS0h3CW2Upr yjQ32MmtjEamcFIXWztIUNwXg85CkzP4ok1uOimBTImc+p7d/bAQfR8UHX66lYbqHG9i YEeGLDuel//fk837ARoRH9+VIY7YL2M4PvrPqD73/b5fwpc9jl/Dmjlhx+asc9HuUhUL zmtxWPGUvw1Ahu2OAHLCXtB/st3bcm3w6vCq3hkUrbz1siYwdJ4yQWrs82Toc++t90da 8f1rX7RUkgFTzNMiUez4VgUN52XXu6CZKAUdjr/wiwa7odSFWfoYpMbJtIo1Zrbgu3QQ /enw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696622375; x=1697227175; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9ARpLZoY7G6kjk0d6PN5ZkwSFj6+JUcxMc8vCi1seIs=; b=VarsetoeZ3cbLjAjYZZJpeUe3d3Lr3xpR4psns8VoWJRuO8K+yzDhoMqphJhaSSiRk D5qduhchaWcK9q2bIoz5x5uu0dGVNwi9QKybB1Kq6P1DdEADqLLiw+Aai7HMbdPYY8XO YWaZ18cnEO5j+iq2tVAwY7QCIGPkQxFTTKhE0MW/YG2VnpkipuVm33ANZAUsdbbq+ol7 6GRux+043fiNL/Sw41YBNijgLGWOFjGSZ5IrmXxB2KwrSv2MYj5pGf3cnlgln35QOnr3 9IXWR6gWT5XfQcPxSnRPaad2I727EkFeiQ2b1x8kq5+1yAxdIcLh+J43CxONT2NDgeU3 irVw== X-Gm-Message-State: AOJu0Yzf8042yU2mqYy0c4q99HO4sUHgMnCuCwNzR4XU+BEXBMJK/c+k n9IjXniUK6grNc3Yo1fK0SNvhjhxaFg= X-Google-Smtp-Source: AGHT+IEqg0a64xientJQOC71Qg+9i8QvhNlt3IiSiI5WaupZrxESzGH1VGgf2O1yZXEAxNnQtnnMeg== X-Received: by 2002:a05:6358:5906:b0:143:8eb4:cf36 with SMTP id g6-20020a056358590600b001438eb4cf36mr9416420rwf.5.1696622375296; Fri, 06 Oct 2023 12:59:35 -0700 (PDT) Received: from chiron.hsd1.or.comcast.net ([2601:1c0:ca00:cea0:4ca0:e9cf:d643:bafd]) by smtp.gmail.com with ESMTPSA id 6-20020a17090a1a0600b00263dfe9b972sm6420971pjk.0.2023.10.06.12.59.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 12:59:34 -0700 (PDT) From: Tim Orling X-Google-Original-From: Tim Orling To: yocto@lists.yoctoproject.org Subject: [layerindex-web 06/10] Dockerfile: drop python3-pil Date: Fri, 6 Oct 2023 12:59:09 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 06 Oct 2023 19:59:38 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/61270 This prevents upgrading Pillow in requirements.txt Signed-off-by: Tim Orling --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d8c38e1..02948b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,6 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update \ python3-pip \ python3-mysqldb \ python3-dev \ - python3-pil \ python3-wheel \ zlib1g-dev \ libfreetype6-dev \ From patchwork Fri Oct 6 19:59:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 31797 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 76E29E94115 for ; Fri, 6 Oct 2023 19:59:38 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mx.groups.io with SMTP id smtpd.web11.4025.1696622377779933295 for ; Fri, 06 Oct 2023 12:59:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=k7fiUCIx; spf=pass (domain: gmail.com, ip: 209.85.216.44, mailfrom: ticotimo@gmail.com) Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-27b22de9b5bso1439930a91.3 for ; Fri, 06 Oct 2023 12:59:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696622377; x=1697227177; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=9L0GazQtmEt9N5p4ompJs/RTz4OcexBJZRwDsxBUJHM=; b=k7fiUCIxBx0//8+u7rdOzN7q92kn7dRsCL8bsxuKzFLerXmYSVgH4jvu+lK/9ni+xN WsZHN75Zf0A6fCysMbdb2mE+mTxj6+SK3q5J0O9RCcvnf3bJHxHF1i3BUVKoEhglk8jW gcEzbn3ixQq0aFlL6AZ2f3jg2vdnpHBGB5/t7REowLzhNTkH0S6oO9VwyxodVdNwR+Rx 8JXb2S2DjPFn98qIZpHzqlVD3hb34pOnqlTV7XJXGMayiFQiSpQ5MvEm4iQJIFSpDtvv vDzHlo3xBIqn0XYhPGfxhpeUZgeFjLGb2uHfwuwTm9K1XwLdz/+sbC+iLaikV7skp8Yc FFsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696622377; x=1697227177; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9L0GazQtmEt9N5p4ompJs/RTz4OcexBJZRwDsxBUJHM=; b=EP1a90dYLnm0L3Lz285G03G+6DDk9Sj8sVEqbcsoWPlkbyQA1h4eMFcBLKHkGfEsdX n20/tjhXyuhBchZkY6fOgYpb/iVEo5zkrK27crhripqe6c9D+QdwfsltSw0dXs4LJo9k bTpDFIYbQAu1xAqn5sPmI9xK5d6htt1JMqVklUid9LEvqKlQKDIrLHnYzYHxYXzO4p2T v88lnia4TrCvzMhTV1M5ZeRieoVezGWy8TtPC97nmU8GKiw+iOxGLw6nbNZr0anWnXuY D4yVBkfEhpCupT0r2svjgX5I9tZurhPJVDrK2/JPbMXGl29idhpzQiwpHIngEotJOplR najA== X-Gm-Message-State: AOJu0YwkSKvqQU6yOp9mBKHGyEXiQFVjjPdJtG5T4MDUQaws2Kv1/mu3 9vbUTuIwp2yDx0U/rEzT/qtqcc1BMRs= X-Google-Smtp-Source: AGHT+IHAx9eFK9aZax13PywDYoyjZ2o+nRz3zt+UcSaa2Z3ysGQYL6OURCqOb3K+9BxLHqizoSM5aw== X-Received: by 2002:a17:90a:bc48:b0:26b:5461:8dd5 with SMTP id t8-20020a17090abc4800b0026b54618dd5mr8372717pjv.42.1696622376910; Fri, 06 Oct 2023 12:59:36 -0700 (PDT) Received: from chiron.hsd1.or.comcast.net ([2601:1c0:ca00:cea0:4ca0:e9cf:d643:bafd]) by smtp.gmail.com with ESMTPSA id 6-20020a17090a1a0600b00263dfe9b972sm6420971pjk.0.2023.10.06.12.59.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 12:59:36 -0700 (PDT) From: Tim Orling X-Google-Original-From: Tim Orling To: yocto@lists.yoctoproject.org Subject: [layerindex-web 07/10] requirements.txt: upgrade all to latest Date: Fri, 6 Oct 2023 12:59:10 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 06 Oct 2023 19:59:38 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/61271 Signed-off-by: Tim Orling --- requirements.txt | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/requirements.txt b/requirements.txt index 40f696c..612e9cc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,26 +1,26 @@ -amqp==5.0.9 -beautifulsoup4==4.10.0 -billiard==3.6.4.0 -celery==5.2.3 +amqp==5.1.1 +beautifulsoup4==4.12.2 +billiard==4.1.0 +celery==5.3.4 confusable-homoglyphs==3.2.0 Django>=4.2,<4.3 django-appconf==1.0.5 -django-axes==5.31.0 -django-cors-headers==3.11.0 -django-ipware==4.0.2 +django-axes==6.1.0 +django-cors-headers==4.2.0 +django-ipware==5.0.0 django-ranged-response==0.2.0 -django-registration==3.2 -django-reversion==4.0.1 -django-reversion-compare==0.14.1 +django-registration==3.4 +django-reversion==5.0.4 +django-reversion-compare==0.16.2 django-simple-captcha==0.5.20 -djangorestframework==3.13.1 -gitdb==4.0.9 +djangorestframework==3.14.0 +gitdb==4.0.10 GitPython==3.1.37 -kombu==5.2.3 -mysqlclient==2.1.0 +kombu==5.3.2 +mysqlclient==2.1.1 Pillow==10.0.1 -pytz==2021.3 +pytz==2023.3 six==1.16.0 smmap==5.0.0 -soupsieve==2.3.1 +soupsieve==2.4.1 vine==5.0.0 From patchwork Fri Oct 6 19:59:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 31801 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 72886E94113 for ; Fri, 6 Oct 2023 19:59:48 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web10.3931.1696622379507200557 for ; Fri, 06 Oct 2023 12:59:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Beo3VuNF; spf=pass (domain: gmail.com, ip: 209.85.216.50, mailfrom: ticotimo@gmail.com) Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-277550774e5so1898526a91.3 for ; Fri, 06 Oct 2023 12:59:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696622379; x=1697227179; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=+fDKbVD4e/P7S6WrtM+OGomVBbJv4wZKE7Vrv5ikP2A=; b=Beo3VuNFHH98RdPCQzbMpalo5FNvX87bMl/GxC9Q4Zvo3hd/QaccfAEk+0LyT0mqVZ 8nJif0VW+6U+4WG14oamELLaybuocFWt3kul3+khX++AgzmxZ4L4m4ljBLkqOwdifbpt ZtvITEmeHqZBD9INbJ+04/ocucI+kWRvSF1ndFNnl8BNMDVaCjJe32JBGWce1JX6/5SK Kr+cA/lXPTxViaG6KbpkzYFDYpESiVdKFoP1tV/JjzJfugTzJIJOikygXfHDVuPzjMW+ +r/uyDaRKC54mqjrrjDLnxhYSMqGlWKtHxbQMiXxCqRAfVLdIWM7oC7X3DPSmhSL+KFp 8uFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696622379; x=1697227179; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+fDKbVD4e/P7S6WrtM+OGomVBbJv4wZKE7Vrv5ikP2A=; b=IAQBUgYLa3LbMogLrbkX0B7elIm3/5bP5tt1OBz5iXcu0GdJRQ+ncQApC90PRm0XP8 EWtrqQeqPmnPN5t+WisbeR0vFpIvvhBdWpS2WlLd9Ro0+2r6ROEuGbqFYo6jIJhB1GA6 5/Eam60ziyqdvClDmAK6nwCpexZbM3SqkQt53+gOJTVi1JgKkqd2ijxt3l7Hhcz0alGa GaMiB72HiQrla0W2uNSRL+CRW+DVzBG5BK3p2Pom2gk9LL474cam9xPnrkTYUKtDVLGe cMl6fH3dY6tKmiAwIrTNSNMzRAo/bfPJQn877wLIiJrZl8cK1DiSh2JvTXqMFIKma7kR eTMA== X-Gm-Message-State: AOJu0YwRLcdWQALQz9xChEhNapb+Qs0185hShE01aqJgYO3EGO5/TyWP Ae3qfZDq4o3UQEUHdAS0wV3soBt14os= X-Google-Smtp-Source: AGHT+IHBVwUm7QERImBHNUkA7tEAtHZYVvWPoSnX9KcZDfmB/YlPfWVLemki2nAiDUKH6wb8NEszEg== X-Received: by 2002:a17:90a:1309:b0:279:310e:33fd with SMTP id h9-20020a17090a130900b00279310e33fdmr8185371pja.22.1696622378680; Fri, 06 Oct 2023 12:59:38 -0700 (PDT) Received: from chiron.hsd1.or.comcast.net ([2601:1c0:ca00:cea0:4ca0:e9cf:d643:bafd]) by smtp.gmail.com with ESMTPSA id 6-20020a17090a1a0600b00263dfe9b972sm6420971pjk.0.2023.10.06.12.59.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 12:59:38 -0700 (PDT) From: Tim Orling X-Google-Original-From: Tim Orling To: yocto@lists.yoctoproject.org Subject: [layerindex-web 08/10] requirements.txt: update dependencies Date: Fri, 6 Oct 2023 12:59:11 -0700 Message-Id: <7989e61fae9d09d851b5eab43d61cdbf674ebb39.1696621423.git.tim.orling@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 06 Oct 2023 19:59:48 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/61272 Use results of: pipenv install pipenv update pip freeze > requirements-freeze.txt Signed-off-by: Tim Orling --- requirements.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/requirements.txt b/requirements.txt index 612e9cc..62b3f7b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,14 @@ amqp==5.1.1 +asgiref==3.7.2 beautifulsoup4==4.12.2 billiard==4.1.0 celery==5.3.4 +click==8.1.7 +click-didyoumean==0.3.0 +click-plugins==1.1.1 +click-repl==0.3.0 confusable-homoglyphs==3.2.0 +diff-match-patch==20230430 Django>=4.2,<4.3 django-appconf==1.0.5 django-axes==6.1.0 @@ -19,8 +25,14 @@ GitPython==3.1.37 kombu==5.3.2 mysqlclient==2.1.1 Pillow==10.0.1 +prompt-toolkit==3.0.39 +python-dateutil==2.8.2 pytz==2023.3 six==1.16.0 smmap==5.0.0 soupsieve==2.4.1 +sqlparse==0.4.4 +typing_extensions==4.8.0 +tzdata==2023.3 vine==5.0.0 +wcwidth==0.2.8 From patchwork Fri Oct 6 19:59:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 31799 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 72853E94111 for ; Fri, 6 Oct 2023 19:59:48 +0000 (UTC) Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by mx.groups.io with SMTP id smtpd.web11.4027.1696622381001580756 for ; Fri, 06 Oct 2023 12:59:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=eR2k4lS5; spf=pass (domain: gmail.com, ip: 209.85.215.172, mailfrom: ticotimo@gmail.com) Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-578a62c088cso2861251a12.1 for ; Fri, 06 Oct 2023 12:59:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696622380; x=1697227180; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=zqrY91zyol23lf0efYV/k8+44ugIJ/z3hXNKOkJKKB8=; b=eR2k4lS5qzAqDUdmoIK5Q79vlUab4VpHkETX+W/HZ+rwAcZ8mayeYK3xlOUSWtWEgN i3xR5e5W63JOKQS7USQCoWWw+IJqJINYkB+OC81hm4VLGziwGBd9wbZ6f2qrzfSGm3Om ielhOZ4gBu8QyhBS1JuWLiYSsNp3hL1ihX2c1XTujo/ygl+7o3diqr1hWtwgGRO+YQB1 D8vDcEboi5qOMcN4AEVon9ck/7t9cxbJSWxb4War//FIN1l2CTMFZ4og2DTAJBOQL7wI ZsZfClEuqy89qbw888DpoSSQj4Pmg5uHAsHAwE7/G0Js4uH4lhVJ5iLkMkrU5Ym6uqcl BTMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696622380; x=1697227180; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zqrY91zyol23lf0efYV/k8+44ugIJ/z3hXNKOkJKKB8=; b=JKmQJ+hLnytLoKksIQ60VrIkt5wp9OAtTkRG24xSx3El0/ontobPrMfYF7sLdgdM5I ZV9BL+o7A37TInJnoV2hTZxn85z7HSCzHnCCdjK14OvVwF3oZM6lCB6rx9EXzIWanUrG UHL68pYtEujZIq49jdp+8brX9NoCmLNF5a1IffI/tSB7k6nIvlaGVT0zTazpdAiJCRgp +YHvqDOBuKYwu4iuHO1cPqFqf87vov5lt5+ETRvVBjuXSR/asWFio8pgr+XyzBnM6izI 72drglxhSVRVPYJSYW0x2tN/0ZzgyIS8pnQZdkXnItpcpwkHOexVHXiD9VgnmCnEoRz2 wMjQ== X-Gm-Message-State: AOJu0Yx73CtSSa+OyFJoNf4Ffm3knqnS3ZCyZaohHSidj3A1nQMSUL1t yitNRXbDobEmuTRkzFtfLg2/ucVaU4M= X-Google-Smtp-Source: AGHT+IFfGH9IA71JBss2nbLYWhaEP5mbh7ZtWi2TSQSwLBendiz5blVFzkWSHSOL4SL3sYOB7vweYQ== X-Received: by 2002:a17:90a:dd43:b0:273:83ac:5eb9 with SMTP id u3-20020a17090add4300b0027383ac5eb9mr8039726pjv.4.1696622380183; Fri, 06 Oct 2023 12:59:40 -0700 (PDT) Received: from chiron.hsd1.or.comcast.net ([2601:1c0:ca00:cea0:4ca0:e9cf:d643:bafd]) by smtp.gmail.com with ESMTPSA id 6-20020a17090a1a0600b00263dfe9b972sm6420971pjk.0.2023.10.06.12.59.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 12:59:39 -0700 (PDT) From: Tim Orling X-Google-Original-From: Tim Orling To: yocto@lists.yoctoproject.org Subject: [layerindex-web 09/10] password_validation.py: fix deprecated ugettext Date: Fri, 6 Oct 2023 12:59:12 -0700 Message-Id: <7dcdd0e2a118a97d577aeead40a73a2a8f21fdfc.1696621423.git.tim.orling@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 06 Oct 2023 19:59:48 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/61273 Use django.utils.translation.gettext instead Signed-off-by: Tim Orling --- password_validation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/password_validation.py b/password_validation.py index 6e15b40..5702a79 100644 --- a/password_validation.py +++ b/password_validation.py @@ -1,7 +1,7 @@ # SPDX-License-Identifier: MIT from django.core.exceptions import ValidationError -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ import re From patchwork Fri Oct 6 19:59:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 31800 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7EB76E94115 for ; Fri, 6 Oct 2023 19:59:48 +0000 (UTC) Received: from mail-oi1-f177.google.com (mail-oi1-f177.google.com [209.85.167.177]) by mx.groups.io with SMTP id smtpd.web10.3934.1696622383376466011 for ; Fri, 06 Oct 2023 12:59:43 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=C7ZKZ/Ul; spf=pass (domain: gmail.com, ip: 209.85.167.177, mailfrom: ticotimo@gmail.com) Received: by mail-oi1-f177.google.com with SMTP id 5614622812f47-3af6bd48093so1681883b6e.3 for ; Fri, 06 Oct 2023 12:59:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696622382; x=1697227182; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=OjAYWM4DMuZTDc9/NwhfjFJ+mKNI1Pov/5JoxD685UI=; b=C7ZKZ/UlujV1Wg9tbQKGWVy4phgyl6hS6W4NTrs/rtdYlHa6qZ0rLlcAkG+nJnwT2R aX62b2fDQGm1N4tUEPqhuRO4QUBOM9Vh9hzCANgwKyqyE8XrDv+ieM+BP141g8hFr21k tlmfiUnMFSe2tzkjdQ1VMwhKSkkA1O0tI5R5qYMsn/skOXvZxF/xwTtiEo/aq/Nc0IMs 6RDC01kanPquhf4rhskIdVA70AHa0sNZxTnUnnckzD7UHeugYCvdByqPhHoL9b5foKGc WCLon3XiWqIIcRHF3wyJ5KOM7h9h8oLimlkFB7xrFoxrpo/hHIDqqt5w6vWG5G8+o0+T 6sgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696622382; x=1697227182; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OjAYWM4DMuZTDc9/NwhfjFJ+mKNI1Pov/5JoxD685UI=; b=RGFBZiSyrZxAy/bGLFwxnCybB0+S468cUg/HwHK7vdh5zQQqilFL7CRRWNqxKQK4Hi gKhU+iPXdtqddnnhhl9nK3jQe8TnSLa9094MHcMM1FmIJVYo77rRbZFEJSltVjGAmqUh yvMMbIBOYdncl0m0NQYG0aRP6dlSFtUKQdaNiYh6brX/0xj8xNcC+6TfrkWRYN5nZUbA Sqh7PqT8Hmv66+wixzIWKy9ksDNIsaY3cRINK3o/oGEy2GmGXm8Z2U8v/rDvuJRVlH7o XBGe/PW7u4JcGo+8gTNg+9I+UzfUlBBgrW0Y82y0Oj3/p8IW/3109D6une3NLtC/TX7F diQw== X-Gm-Message-State: AOJu0Ywv6VNXo/kgfakXyiT6BHk15L9clz3t9vo1eqM5k/6lD2tArUSB A7MfnuFBwM4dsej8rsewEy/lWisU+5Y= X-Google-Smtp-Source: AGHT+IGtQfsYzhoYRFV7RN0SwjqFJyostEeH+XYtAUwI4TLpThMbkAARo/32AdhsV6eR4O5/Qz99Ew== X-Received: by 2002:a05:6358:716:b0:143:897e:6e31 with SMTP id e22-20020a056358071600b00143897e6e31mr7990808rwj.7.1696622382359; Fri, 06 Oct 2023 12:59:42 -0700 (PDT) Received: from chiron.hsd1.or.comcast.net ([2601:1c0:ca00:cea0:4ca0:e9cf:d643:bafd]) by smtp.gmail.com with ESMTPSA id 6-20020a17090a1a0600b00263dfe9b972sm6420971pjk.0.2023.10.06.12.59.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 12:59:41 -0700 (PDT) From: Tim Orling X-Google-Original-From: Tim Orling To: yocto@lists.yoctoproject.org Subject: [layerindex-web 10/10] docker/settings.py: add CSRF_TRUSTED_ORIGINS Date: Fri, 6 Oct 2023 12:59:13 -0700 Message-Id: <378ae0d018d956e5ae242844bed48087d8d37831.1696621423.git.tim.orling@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 06 Oct 2023 19:59:48 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/61274 In addition to ALLOWED_HOSTS, we now must have CSRF_TRUSTED_ORIGINS defined. This variable requires the scheme (http:// or https://). Like ALLOWED_HOSTS, CSRF_TRUSTED_ORIGINS is a list of strings, with one entry for each host which is trusted for POST requests. https://docs.djangoproject.com/en/4.2/ref/settings/#csrf-trusted-origins Signed-off-by: Tim Orling --- docker/settings.py | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/settings.py b/docker/settings.py index a73178c..33ab332 100644 --- a/docker/settings.py +++ b/docker/settings.py @@ -307,6 +307,7 @@ TOOLS_LOG_DIR = "" USE_X_FORWARDED_HOST = True ALLOWED_HOSTS = [os.getenv('HOSTNAME', 'layers.test')] +CSRF_TRUSTED_ORIGINS = ['https://' + os.getenv('HOSTNAME', 'layers.test')] SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') SECURE_BROWSER_XSS_FILTER = True SECURE_CONTENT_TYPE_NOSNIFF = True