From d8a510156c9d44554eaf05043f99402a6fded808 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 18:20:19 +0000 Subject: [PATCH 01/15] chore(deps): update actions/setup-node action to v4 --- .github/workflows/housekeeping.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/housekeeping.yml b/.github/workflows/housekeeping.yml index 117b71aad..54eea51d9 100644 --- a/.github/workflows/housekeeping.yml +++ b/.github/workflows/housekeeping.yml @@ -22,7 +22,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: "16" From 39026d59a55ee47e376465d783895a28d388723f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 25 Oct 2023 04:48:08 +0000 Subject: [PATCH 02/15] chore(deps): update pre-commit hook psf/black-pre-commit-mirror to v23.10.1 --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6a4dc86f9..2932b0c9e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -54,7 +54,7 @@ repos: args: [--resolve-all-configs] - repo: https://github.com/psf/black-pre-commit-mirror - rev: 23.10.0 + rev: 23.10.1 hooks: - id: black From 87fbb7ea8f4b102a0e678f25ee2a3621d45f888b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 04:15:17 +0000 Subject: [PATCH 03/15] chore(deps): lock file maintenance (legacy/composer.json) --- legacy/composer.lock | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/legacy/composer.lock b/legacy/composer.lock index 0f88e2ae4..0e91ad53f 100644 --- a/legacy/composer.lock +++ b/legacy/composer.lock @@ -143,16 +143,16 @@ }, { "name": "james-heinrich/getid3", - "version": "v1.9.22", + "version": "v1.9.23", "source": { "type": "git", "url": "https://github.com/JamesHeinrich/getID3.git", - "reference": "45f20faa0f0a24489740392c5b512ddcc36deccd" + "reference": "06c7482532ff2b3f9111b011d880ca6699c8542b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JamesHeinrich/getID3/zipball/45f20faa0f0a24489740392c5b512ddcc36deccd", - "reference": "45f20faa0f0a24489740392c5b512ddcc36deccd", + "url": "https://api.github.com/repos/JamesHeinrich/getID3/zipball/06c7482532ff2b3f9111b011d880ca6699c8542b", + "reference": "06c7482532ff2b3f9111b011d880ca6699c8542b", "shasum": "" }, "require": { @@ -204,9 +204,9 @@ ], "support": { "issues": "https://github.com/JamesHeinrich/getID3/issues", - "source": "https://github.com/JamesHeinrich/getID3/tree/v1.9.22" + "source": "https://github.com/JamesHeinrich/getID3/tree/v1.9.23" }, - "time": "2022-09-29T16:41:13+00:00" + "time": "2023-10-19T13:18:49+00:00" }, { "name": "league/uri", @@ -760,22 +760,22 @@ }, { "name": "php-amqplib/php-amqplib", - "version": "v3.5.4", + "version": "v3.6.0", "source": { "type": "git", "url": "https://github.com/php-amqplib/php-amqplib.git", - "reference": "1aecbd182b35eb039667c50d7d92d71f105be779" + "reference": "fb84e99589de0904a25861451b0552f806284ee5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-amqplib/php-amqplib/zipball/1aecbd182b35eb039667c50d7d92d71f105be779", - "reference": "1aecbd182b35eb039667c50d7d92d71f105be779", + "url": "https://api.github.com/repos/php-amqplib/php-amqplib/zipball/fb84e99589de0904a25861451b0552f806284ee5", + "reference": "fb84e99589de0904a25861451b0552f806284ee5", "shasum": "" }, "require": { "ext-mbstring": "*", "ext-sockets": "*", - "php": "^7.1||^8.0", + "php": "^7.2||^8.0", "phpseclib/phpseclib": "^2.0|^3.0" }, "conflict": { @@ -835,22 +835,22 @@ ], "support": { "issues": "https://github.com/php-amqplib/php-amqplib/issues", - "source": "https://github.com/php-amqplib/php-amqplib/tree/v3.5.4" + "source": "https://github.com/php-amqplib/php-amqplib/tree/v3.6.0" }, - "time": "2023-07-01T11:25:08+00:00" + "time": "2023-10-22T15:02:02+00:00" }, { "name": "phpseclib/phpseclib", - "version": "3.0.23", + "version": "3.0.33", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "866cc78fbd82462ffd880e3f65692afe928bed50" + "reference": "33fa69b2514a61138dd48e7a49f99445711e0ad0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/866cc78fbd82462ffd880e3f65692afe928bed50", - "reference": "866cc78fbd82462ffd880e3f65692afe928bed50", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/33fa69b2514a61138dd48e7a49f99445711e0ad0", + "reference": "33fa69b2514a61138dd48e7a49f99445711e0ad0", "shasum": "" }, "require": { @@ -931,7 +931,7 @@ ], "support": { "issues": "https://github.com/phpseclib/phpseclib/issues", - "source": "https://github.com/phpseclib/phpseclib/tree/3.0.23" + "source": "https://github.com/phpseclib/phpseclib/tree/3.0.33" }, "funding": [ { @@ -947,7 +947,7 @@ "type": "tidelift" } ], - "time": "2023-09-18T17:22:01+00:00" + "time": "2023-10-21T14:00:39+00:00" }, { "name": "psr/http-message", From 274baf60a7298816f338a0b057343a8e6bbd3b38 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 3 Nov 2023 10:42:58 +0000 Subject: [PATCH 04/15] chore(deps): update amannn/action-semantic-pull-request action to v5.4.0 --- .github/workflows/pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 9fdb15129..f12eadc38 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -12,7 +12,7 @@ jobs: name: Validate PR title runs-on: ubuntu-latest steps: - - uses: amannn/action-semantic-pull-request@v5.3.0 + - uses: amannn/action-semantic-pull-request@v5.4.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: From 23e4973183bb9a8581d49d735ccda365018d44bc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 8 Nov 2023 06:26:35 +0000 Subject: [PATCH 05/15] chore(deps): update pre-commit hook psf/black-pre-commit-mirror to v23.11.0 --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2932b0c9e..6576d9038 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -54,7 +54,7 @@ repos: args: [--resolve-all-configs] - repo: https://github.com/psf/black-pre-commit-mirror - rev: 23.10.1 + rev: 23.11.0 hooks: - id: black From c764a5a648ac6cf6c1f63cd9be6de9fe07c40988 Mon Sep 17 00:00:00 2001 From: Jonas L Date: Mon, 13 Nov 2023 19:46:47 +0100 Subject: [PATCH 06/15] fix: add parent function name in setValue exception (#2777) * fix: add parent function name in setValue exception * style: fmt --- legacy/application/models/Preference.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/legacy/application/models/Preference.php b/legacy/application/models/Preference.php index c126502e9..4297e874c 100644 --- a/legacy/application/models/Preference.php +++ b/legacy/application/models/Preference.php @@ -63,8 +63,10 @@ class Application_Model_Preference $paramMap = []; if ($result > 1) { // this case should not happen. + $caller = debug_backtrace()[1]['function']; + throw new Exception('Invalid number of results returned. Should be ' . - "0 or 1, but is '{$result}' instead"); + "0 or 1, but is '{$result}' instead, caller={$caller}"); } if ($result == 1) { // result found From 229d99f7f1b93ae067971bcfe46796dc419f6008 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 13 Nov 2023 18:47:21 +0000 Subject: [PATCH 07/15] chore(deps): update pre-commit hook pre-commit/mirrors-prettier to v3.1.0 --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6576d9038..92be2f53e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -29,7 +29,7 @@ repos: exclude: ^api - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.0.3 + rev: v3.1.0 hooks: - id: prettier files: \.(md|mdx|yml|yaml|js|jsx|ts|tsx|json|css)$ From ce915671dbd741c567d2245addb9be0d1397b665 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 14 Nov 2023 22:19:15 +0000 Subject: [PATCH 08/15] chore(deps): lock file maintenance (legacy/composer.json) --- legacy/composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/legacy/composer.lock b/legacy/composer.lock index 0e91ad53f..2a786980a 100644 --- a/legacy/composer.lock +++ b/legacy/composer.lock @@ -1080,16 +1080,16 @@ }, { "name": "symfony/config", - "version": "v5.4.26", + "version": "v5.4.31", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "8109892f27beed9252bd1f1c1880aeb4ad842650" + "reference": "dd5ea39de228813aba0c23c3a4153da2a4cf3cd9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/8109892f27beed9252bd1f1c1880aeb4ad842650", - "reference": "8109892f27beed9252bd1f1c1880aeb4ad842650", + "url": "https://api.github.com/repos/symfony/config/zipball/dd5ea39de228813aba0c23c3a4153da2a4cf3cd9", + "reference": "dd5ea39de228813aba0c23c3a4153da2a4cf3cd9", "shasum": "" }, "require": { @@ -1139,7 +1139,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v5.4.26" + "source": "https://github.com/symfony/config/tree/v5.4.31" }, "funding": [ { @@ -1155,7 +1155,7 @@ "type": "tidelift" } ], - "time": "2023-07-19T20:21:11+00:00" + "time": "2023-11-09T08:22:43+00:00" }, { "name": "symfony/deprecation-contracts", From 59f7bbdcc3cae4dc143a3c7f064839f6082e1cc5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 04:17:55 +0000 Subject: [PATCH 09/15] chore(deps): lock file maintenance (legacy/composer.json) --- legacy/composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/legacy/composer.lock b/legacy/composer.lock index 2a786980a..c34659921 100644 --- a/legacy/composer.lock +++ b/legacy/composer.lock @@ -3711,16 +3711,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.24.2", + "version": "1.24.3", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "bcad8d995980440892759db0c32acae7c8e79442" + "reference": "12f01d214f1c73b9c91fdb3b1c415e4c70652083" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bcad8d995980440892759db0c32acae7c8e79442", - "reference": "bcad8d995980440892759db0c32acae7c8e79442", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/12f01d214f1c73b9c91fdb3b1c415e4c70652083", + "reference": "12f01d214f1c73b9c91fdb3b1c415e4c70652083", "shasum": "" }, "require": { @@ -3752,9 +3752,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.2" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.3" }, - "time": "2023-09-26T12:28:12+00:00" + "time": "2023-11-18T20:15:32+00:00" }, { "name": "phpunit/dbunit", From 651bb9261c98d3fd015ec52c716e2481b653af3b Mon Sep 17 00:00:00 2001 From: Jonas L Date: Mon, 18 Dec 2023 18:54:07 +0100 Subject: [PATCH 10/15] chore(api): disable duplicate-code check (#2799) * chore(api): disable duplicate-code check * refactor: fix linting errors --- api/libretime_api/permission_constants.py | 2 +- api/libretime_api/schedule/models/show.py | 2 +- api/pyproject.toml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/api/libretime_api/permission_constants.py b/api/libretime_api/permission_constants.py index 01890e24a..51a95e100 100644 --- a/api/libretime_api/permission_constants.py +++ b/api/libretime_api/permission_constants.py @@ -1,4 +1,4 @@ -from .core.models import Role +from .core.models.role import Role GUEST_PERMISSIONS = [ "view_schedule", diff --git a/api/libretime_api/schedule/models/show.py b/api/libretime_api/schedule/models/show.py index ce13f689e..a1a6cecf3 100644 --- a/api/libretime_api/schedule/models/show.py +++ b/api/libretime_api/schedule/models/show.py @@ -69,7 +69,7 @@ class Show(models.Model): auto_playlist_enabled = models.BooleanField(db_column="has_autoplaylist") auto_playlist_repeat = models.BooleanField(db_column="autoplaylist_repeat") - hosts = models.ManyToManyField( + hosts = models.ManyToManyField( # type: ignore[var-annotated] "core.User", through="ShowHost", ) diff --git a/api/pyproject.toml b/api/pyproject.toml index 6cb37f6cd..4a31d530b 100644 --- a/api/pyproject.toml +++ b/api/pyproject.toml @@ -10,6 +10,7 @@ django-settings-module = "libretime_api.settings.testing" [tool.pylint.messages_control] extension-pkg-whitelist = "pydantic" disable = [ + "duplicate-code", "fixme", "missing-class-docstring", "missing-function-docstring", From 1820970ce38c45344cd01cf489f258b9a0f0f649 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 19:02:03 +0100 Subject: [PATCH 11/15] fix(deps): update dependency friendsofphp/php-cs-fixer to <3.41.2 (stable) (#2766) * fix(deps): update dependency friendsofphp/php-cs-fixer to <3.41.2 * style: format files using php-cs-fixer --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: jo --- .../application/controllers/PlaylistController.php | 6 +++--- .../application/controllers/PreferenceController.php | 2 +- legacy/application/models/Block.php | 12 ++++++------ legacy/application/services/ShowService.php | 10 +++++----- legacy/tools/composer.json | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/legacy/application/controllers/PlaylistController.php b/legacy/application/controllers/PlaylistController.php index 16c0b3284..7b045e4cf 100644 --- a/legacy/application/controllers/PlaylistController.php +++ b/legacy/application/controllers/PlaylistController.php @@ -253,7 +253,7 @@ class PlaylistController extends Zend_Controller_Action Logging::info("Currently active {$type} {$obj_sess->id}"); if (in_array($obj_sess->id, $ids)) { Logging::info("Deleting currently active {$type}"); - // Application_Model_Library::changePlaylist(null, $type); + // Application_Model_Library::changePlaylist(null, $type); } else { Logging::info("Not deleting currently active {$type}"); $obj = new $objInfo['className']($obj_sess->id); @@ -562,7 +562,7 @@ class PlaylistController extends Zend_Controller_Action $bl->saveSmartBlockCriteria($params['data']); $this->createUpdateResponse($bl, true); $this->view->result = 0; - // $result['html'] = $this->createFullResponse($bl, true, true); + // $result['html'] = $this->createFullResponse($bl, true, true); } else { $this->view->form = $form; $this->view->unsavedName = $params['name']; @@ -601,7 +601,7 @@ class PlaylistController extends Zend_Controller_Action $result = $bl->generateSmartBlock($params['data']); $this->view->result = $result['result']; $this->createUpdateResponse($bl, true); - // $this->_helper->json->sendJson(array("result"=>0, "html"=>$this->createFullResponse($bl, true, true))); + // $this->_helper->json->sendJson(array("result"=>0, "html"=>$this->createFullResponse($bl, true, true))); } else { $this->view->obj = $bl; $this->view->id = $bl->getId(); diff --git a/legacy/application/controllers/PreferenceController.php b/legacy/application/controllers/PreferenceController.php index 42a107e66..3b2f0c530 100644 --- a/legacy/application/controllers/PreferenceController.php +++ b/legacy/application/controllers/PreferenceController.php @@ -69,7 +69,7 @@ class PreferenceController extends Zend_Controller_Action $this->view->statusMsg = "
" . _('Preferences updated.') . '
'; $form = new Application_Form_Preferences(); $this->view->form = $form; - // $this->_helper->json->sendJson(array("valid"=>"true", "html"=>$this->view->render('preference/index.phtml'))); + // $this->_helper->json->sendJson(array("valid"=>"true", "html"=>$this->view->render('preference/index.phtml'))); } else { $this->view->form = $form; // $this->_helper->json->sendJson(array("valid"=>"false", "html"=>$this->view->render('preference/index.phtml'))); diff --git a/legacy/application/models/Block.php b/legacy/application/models/Block.php index b1e954519..e2248a7b7 100644 --- a/legacy/application/models/Block.php +++ b/legacy/application/models/Block.php @@ -1652,12 +1652,12 @@ SQL; if (isset($criteria['extra'])) { $spCriteriaExtra = $criteria['extra'] * 1000; } - /* - * If user is searching for an exact match of length we need to - * search as if it starts with the specified length because the - * user only sees the rounded version (i.e. 4:02.7 is 4:02.761625 - * in the database) - */ + /* + * If user is searching for an exact match of length we need to + * search as if it starts with the specified length because the + * user only sees the rounded version (i.e. 4:02.7 is 4:02.761625 + * in the database) + */ } elseif (in_array($spCriteria, ['length', 'cuein', 'cueout']) && $spCriteriaModifier == 'is') { $spCriteriaModifier = 'starts with'; $spCriteria .= '::text'; diff --git a/legacy/application/services/ShowService.php b/legacy/application/services/ShowService.php index b1302b92d..db1b609ac 100644 --- a/legacy/application/services/ShowService.php +++ b/legacy/application/services/ShowService.php @@ -595,7 +595,7 @@ SQL; $this->deleteAllInstances($showId); $this->deleteAllShowDays($showId); - // when repeating by day of the month (1st, 2nd, etc.) we do not store the repeat week days + // when repeating by day of the month (1st, 2nd, etc.) we do not store the repeat week days } elseif ($currentRepeatType != 2) { // repeat type is the same, check if the days of the week are the same $repeatingDaysChanged = false; @@ -881,10 +881,10 @@ SQL; CcShowQuery::create() ->filterByDbId($showId) ->delete(); - // There is only one cc_show_instance if the user selects 'Delete This Instance' - // There is more than one cc_show_instance if the user selects 'Delete This - // Instance and All Following'. We only need to set the last_show value - // when 'Delete This Instance and All Following' has been selected + // There is only one cc_show_instance if the user selects 'Delete This Instance' + // There is more than one cc_show_instance if the user selects 'Delete This + // Instance and All Following'. We only need to set the last_show value + // when 'Delete This Instance and All Following' has been selected } elseif (count($ccShowInstances) > 1) { $this->setLastRepeatingShowDate($showId); } diff --git a/legacy/tools/composer.json b/legacy/tools/composer.json index eec766b85..307853c3d 100644 --- a/legacy/tools/composer.json +++ b/legacy/tools/composer.json @@ -1,6 +1,6 @@ { "require": { "php": "^7.4", - "friendsofphp/php-cs-fixer": "<3.35.2" + "friendsofphp/php-cs-fixer": "<3.41.2" } } From 4715ccf083a5fe3071724f507799872b2a4dde09 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 19:02:17 +0100 Subject: [PATCH 12/15] chore(deps): update dependency uvicorn to >=0.17.6,<0.25.0 (#2774) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- api/requirements.txt | 2 +- api/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/requirements.txt b/api/requirements.txt index a2362862f..40343ad15 100644 --- a/api/requirements.txt +++ b/api/requirements.txt @@ -8,4 +8,4 @@ drf-spectacular>=0.22.1,<0.27 gunicorn>=20.1.0,<21.3 psycopg[c]>=3.1.8,<3.2 requests>=2.31.0,<2.32 -uvicorn[standard]>=0.17.6,<0.24.0 +uvicorn[standard]>=0.17.6,<0.25.0 diff --git a/api/setup.py b/api/setup.py index a4ed2dd92..35bb73d0f 100644 --- a/api/setup.py +++ b/api/setup.py @@ -35,7 +35,7 @@ setup( "prod": [ "gunicorn>=20.1.0,<21.3", "psycopg[c]>=3.1.8,<3.2", - "uvicorn[standard]>=0.17.6,<0.24.0", + "uvicorn[standard]>=0.17.6,<0.25.0", ], "dev": [ "django-coverage-plugin>=3.0.0,<4", From d192b6defc50362256059feab4e1e6f374e9d43c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 19:02:31 +0100 Subject: [PATCH 13/15] chore(deps): update dependency django-filter to >=2.4.0,<23.6 (#2783) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- api/requirements.txt | 2 +- api/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/requirements.txt b/api/requirements.txt index 40343ad15..0aac4c471 100644 --- a/api/requirements.txt +++ b/api/requirements.txt @@ -1,7 +1,7 @@ # Please do not edit this file, edit the setup.py file! # This file is auto-generated by tools/extract_requirements.py. django-cors-headers>=3.14.0,<4.4 -django-filter>=2.4.0,<23.4 +django-filter>=2.4.0,<23.6 django>=4.2.0,<4.3 djangorestframework>=3.14.0,<3.15 drf-spectacular>=0.22.1,<0.27 diff --git a/api/setup.py b/api/setup.py index 35bb73d0f..935bde2be 100644 --- a/api/setup.py +++ b/api/setup.py @@ -25,7 +25,7 @@ setup( }, install_requires=[ "django-cors-headers>=3.14.0,<4.4", - "django-filter>=2.4.0,<23.4", + "django-filter>=2.4.0,<23.6", "django>=4.2.0,<4.3", "djangorestframework>=3.14.0,<3.15", "drf-spectacular>=0.22.1,<0.27", From 0f49a117136afeae168373baefc7b303286b83c7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 19:12:09 +0100 Subject: [PATCH 14/15] chore(deps): update dependency drf-spectacular to >=0.22.1,<0.28 (#2801) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- api/requirements.txt | 2 +- api/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/requirements.txt b/api/requirements.txt index 0aac4c471..2695eab72 100644 --- a/api/requirements.txt +++ b/api/requirements.txt @@ -4,7 +4,7 @@ django-cors-headers>=3.14.0,<4.4 django-filter>=2.4.0,<23.6 django>=4.2.0,<4.3 djangorestframework>=3.14.0,<3.15 -drf-spectacular>=0.22.1,<0.27 +drf-spectacular>=0.22.1,<0.28 gunicorn>=20.1.0,<21.3 psycopg[c]>=3.1.8,<3.2 requests>=2.31.0,<2.32 diff --git a/api/setup.py b/api/setup.py index 935bde2be..ae69b9731 100644 --- a/api/setup.py +++ b/api/setup.py @@ -28,7 +28,7 @@ setup( "django-filter>=2.4.0,<23.6", "django>=4.2.0,<4.3", "djangorestframework>=3.14.0,<3.15", - "drf-spectacular>=0.22.1,<0.27", + "drf-spectacular>=0.22.1,<0.28", "requests>=2.31.0,<2.32", ], extras_require={ From c0465f85f4769331e70083f5fedae41121a68f1f Mon Sep 17 00:00:00 2001 From: Jonas L Date: Mon, 18 Dec 2023 19:21:57 +0100 Subject: [PATCH 15/15] chore: remove pylint install workaround (#2802) --- tools/python.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/python.mk b/tools/python.mk index dfdfef6ca..deb20d60c 100644 --- a/tools/python.mk +++ b/tools/python.mk @@ -8,15 +8,11 @@ CPU_CORES := $(shell N=$$(nproc); echo $$(( $$N > 4 ? 4 : $$N ))) # BANDIT_ARG = # PYTEST_ARG = -# SETUPTOOLS_ENABLE_FEATURES=legacy-editable is required to work -# around https://github.com/PyCQA/pylint/issues/7306 VENV = .venv install: $(VENV) $(VENV): python3 -m venv $(VENV) $(VENV)/bin/pip install --upgrade pip setuptools wheel - - SETUPTOOLS_ENABLE_FEATURES=legacy-editable \ $(VENV)/bin/pip install \ --requirement ../tools/python-requirements.txt \ $(PIP_INSTALL)