From 4648997a1017da68dcf5235e527e861f2c85cf91 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Thu, 15 Feb 2024 10:06:37 -0500 Subject: [PATCH 1/3] Support a new changelog entry type: deps --- mix.exs | 2 +- mix.lock | 4 ++-- tools/check-changelog | 2 +- tools/collect-changelog | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mix.exs b/mix.exs index 580f0aefc..582092aef 100644 --- a/mix.exs +++ b/mix.exs @@ -137,7 +137,7 @@ defmodule Pleroma.Mixfile do {:calendar, "~> 1.0"}, {:cachex, "~> 3.2"}, {:poison, "~> 3.0", override: true}, - {:tesla, "~> 1.4.0", override: true}, + {:tesla, "~> 1.8.0"}, {:castore, "~> 0.1"}, {:cowlib, "~> 2.9", override: true}, {:gun, "~> 2.0.0-rc.1", override: true}, diff --git a/mix.lock b/mix.lock index 2da3ecda1..a5fccbec4 100644 --- a/mix.lock +++ b/mix.lock @@ -52,7 +52,7 @@ "fast_html": {:hex, :fast_html, "2.2.0", "6c5ef1be087a4ed613b0379c13f815c4d11742b36b67bb52cee7859847c84520", [:make, :mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:nimble_pool, "~> 0.2.0", [hex: :nimble_pool, repo: "hexpm", optional: false]}], "hexpm", "064c4f23b4a6168f9187dac8984b056f2c531bb0787f559fd6a8b34b38aefbae"}, "fast_sanitize": {:hex, :fast_sanitize, "0.2.3", "67b93dfb34e302bef49fec3aaab74951e0f0602fd9fa99085987af05bd91c7a5", [:mix], [{:fast_html, "~> 2.0", [hex: :fast_html, repo: "hexpm", optional: false]}, {:plug, "~> 1.8", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "e8ad286d10d0386e15d67d0ee125245ebcfbc7d7290b08712ba9013c8c5e56e2"}, "file_system": {:hex, :file_system, "0.2.10", "fb082005a9cd1711c05b5248710f8826b02d7d1784e7c3451f9c1231d4fc162d", [:mix], [], "hexpm", "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"}, - "finch": {:hex, :finch, "0.17.0", "17d06e1d44d891d20dbd437335eebe844e2426a0cd7e3a3e220b461127c73f70", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.3", [hex: :mint, repo: "hexpm", optional: false]}, {:nimble_options, "~> 0.4 or ~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:nimble_pool, "~> 0.2.6 or ~> 1.0", [hex: :nimble_pool, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "8d014a661bb6a437263d4b5abf0bcbd3cf0deb26b1e8596f2a271d22e48934c7"}, + "finch": {:hex, :finch, "0.18.0", "944ac7d34d0bd2ac8998f79f7a811b21d87d911e77a786bc5810adb75632ada4", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.3", [hex: :mint, repo: "hexpm", optional: false]}, {:nimble_options, "~> 0.4 or ~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:nimble_pool, "~> 0.2.6 or ~> 1.0", [hex: :nimble_pool, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "69f5045b042e531e53edc2574f15e25e735b522c37e2ddb766e15b979e03aa65"}, "flake_id": {:hex, :flake_id, "0.1.0", "7716b086d2e405d09b647121a166498a0d93d1a623bead243e1f74216079ccb3", [:mix], [{:base62, "~> 1.2", [hex: :base62, repo: "hexpm", optional: false]}, {:ecto, ">= 2.0.0", [hex: :ecto, repo: "hexpm", optional: true]}], "hexpm", "31fc8090fde1acd267c07c36ea7365b8604055f897d3a53dd967658c691bd827"}, "floki": {:hex, :floki, "0.35.2", "87f8c75ed8654b9635b311774308b2760b47e9a579dabf2e4d5f1e1d42c39e0b", [:mix], [], "hexpm", "6b05289a8e9eac475f644f09c2e4ba7e19201fd002b89c28c1293e7bd16773d9"}, "gen_smtp": {:hex, :gen_smtp, "0.15.0", "9f51960c17769b26833b50df0b96123605a8024738b62db747fece14eb2fbfcc", [:rebar3], [], "hexpm", "29bd14a88030980849c7ed2447b8db6d6c9278a28b11a44cafe41b791205440f"}, @@ -133,7 +133,7 @@ "telemetry_metrics": {:hex, :telemetry_metrics, "0.6.2", "2caabe9344ec17eafe5403304771c3539f3b6e2f7fb6a6f602558c825d0d0bfb", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "9b43db0dc33863930b9ef9d27137e78974756f5f198cae18409970ed6fa5b561"}, "telemetry_metrics_prometheus_core": {:hex, :telemetry_metrics_prometheus_core, "1.2.0", "b583c3f18508f5c5561b674d16cf5d9afd2ea3c04505b7d92baaeac93c1b8260", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:telemetry_metrics, "~> 0.6", [hex: :telemetry_metrics, repo: "hexpm", optional: false]}], "hexpm", "9cba950e1c4733468efbe3f821841f34ac05d28e7af7798622f88ecdbbe63ea3"}, "telemetry_poller": {:hex, :telemetry_poller, "1.0.0", "db91bb424e07f2bb6e73926fcafbfcbcb295f0193e0a00e825e589a0a47e8453", [:rebar3], [{:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "b3a24eafd66c3f42da30fc3ca7dda1e9d546c12250a2d60d7b81d264fbec4f6e"}, - "tesla": {:hex, :tesla, "1.4.4", "bb89aa0c9745190930366f6a2ac612cdf2d0e4d7fff449861baa7875afd797b2", [:mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: true]}, {:exjsx, ">= 3.0.0", [hex: :exjsx, repo: "hexpm", optional: true]}, {:finch, "~> 0.3", [hex: :finch, repo: "hexpm", optional: true]}, {:fuse, "~> 2.4", [hex: :fuse, repo: "hexpm", optional: true]}, {:gun, "~> 1.3", [hex: :gun, repo: "hexpm", optional: true]}, {:hackney, "~> 1.6", [hex: :hackney, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.0", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.0", [hex: :mint, repo: "hexpm", optional: true]}, {:poison, ">= 1.0.0", [hex: :poison, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "d5503a49f9dec1b287567ea8712d085947e247cb11b06bc54adb05bfde466457"}, + "tesla": {:hex, :tesla, "1.8.0", "d511a4f5c5e42538d97eef7c40ec4f3e44effdc5068206f42ed859e09e51d1fd", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:exjsx, ">= 3.0.0", [hex: :exjsx, repo: "hexpm", optional: true]}, {:finch, "~> 0.13", [hex: :finch, repo: "hexpm", optional: true]}, {:fuse, "~> 2.4", [hex: :fuse, repo: "hexpm", optional: true]}, {:gun, ">= 1.0.0", [hex: :gun, repo: "hexpm", optional: true]}, {:hackney, "~> 1.6", [hex: :hackney, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.2", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.0", [hex: :mint, repo: "hexpm", optional: true]}, {:msgpax, "~> 2.3", [hex: :msgpax, repo: "hexpm", optional: true]}, {:poison, ">= 1.0.0", [hex: :poison, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "10501f360cd926a309501287470372af1a6e1cbed0f43949203a4c13300bc79f"}, "thousand_island": {:hex, :thousand_island, "1.3.2", "bc27f9afba6e1a676dd36507d42e429935a142cf5ee69b8e3f90bff1383943cd", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "0e085b93012cd1057b378fce40cbfbf381ff6d957a382bfdd5eca1a98eec2535"}, "timex": {:hex, :timex, "3.7.7", "3ed093cae596a410759104d878ad7b38e78b7c2151c6190340835515d4a46b8a", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:gettext, "~> 0.10", [hex: :gettext, repo: "hexpm", optional: false]}, {:tzdata, "~> 1.0", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm", "0ec4b09f25fe311321f9fc04144a7e3affe48eb29481d7a5583849b6c4dfa0a7"}, "toml": {:hex, :toml, "0.7.0", "fbcd773caa937d0c7a02c301a1feea25612720ac3fa1ccb8bfd9d30d822911de", [:mix], [], "hexpm", "0690246a2478c1defd100b0c9b89b4ea280a22be9a7b313a8a058a2408a2fa70"}, diff --git a/tools/check-changelog b/tools/check-changelog index d053ed577..28ef8454e 100644 --- a/tools/check-changelog +++ b/tools/check-changelog @@ -6,7 +6,7 @@ git remote add upstream https://git.pleroma.social/pleroma/pleroma.git git fetch upstream ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}:refs/remotes/upstream/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME git diff --raw --no-renames upstream/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME HEAD -- changelog.d | \ - grep ' A\t' | grep '\.\(skip\|add\|remove\|fix\|security\|change\)$' + grep ' A\t' | grep '\.\(add\|change\|deps\|fix\|remove\|security\)$' ret=$? if [ $ret -eq 0 ]; then diff --git a/tools/collect-changelog b/tools/collect-changelog index 1e12d5640..d0e4905d4 100755 --- a/tools/collect-changelog +++ b/tools/collect-changelog @@ -23,5 +23,6 @@ collectType change Changed collectType add Added collectType fix Fixed collectType remove Removed +collectType deps Dependencies rm changelog.d/* From 772f8d08cf349e0357d264065d80b9019ac70284 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Thu, 15 Feb 2024 10:07:30 -0500 Subject: [PATCH 2/3] Tesla changelog --- changelog.d/tesla.deps | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/tesla.deps diff --git a/changelog.d/tesla.deps b/changelog.d/tesla.deps new file mode 100644 index 000000000..799bbc670 --- /dev/null +++ b/changelog.d/tesla.deps @@ -0,0 +1 @@ +Update Tesla HTTP client middleware to 1.8.0 From 2a4fa4c408d874d8b938f780337d2956b6f0101f Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Thu, 15 Feb 2024 10:20:52 -0500 Subject: [PATCH 3/3] Add support for a "deps" changelog type and document deps changes since 2.6.1 release --- changelog.d/bandit.change | 1 - changelog.d/bandit.deps | 1 + changelog.d/eblurhash.deps | 1 + changelog.d/exile.deps | 1 + changelog.d/floki.deps | 1 + changelog.d/http_signatures.deps | 1 + changelog.d/phoenix.deps | 1 + changelog.d/{promex.change => promex.deps} | 0 changelog.d/vix.deps | 1 + 9 files changed, 7 insertions(+), 1 deletion(-) delete mode 100644 changelog.d/bandit.change create mode 100644 changelog.d/bandit.deps create mode 100644 changelog.d/eblurhash.deps create mode 100644 changelog.d/exile.deps create mode 100644 changelog.d/floki.deps create mode 100644 changelog.d/http_signatures.deps create mode 100644 changelog.d/phoenix.deps rename changelog.d/{promex.change => promex.deps} (100%) create mode 100644 changelog.d/vix.deps diff --git a/changelog.d/bandit.change b/changelog.d/bandit.change deleted file mode 100644 index 7a1104314..000000000 --- a/changelog.d/bandit.change +++ /dev/null @@ -1 +0,0 @@ -Support Bandit as an alternative to Cowboy for the HTTP server. diff --git a/changelog.d/bandit.deps b/changelog.d/bandit.deps new file mode 100644 index 000000000..b60d1d39c --- /dev/null +++ b/changelog.d/bandit.deps @@ -0,0 +1 @@ +Support Bandit as an alternative to Cowboy for the HTTP server diff --git a/changelog.d/eblurhash.deps b/changelog.d/eblurhash.deps new file mode 100644 index 000000000..0f7f7ed5f --- /dev/null +++ b/changelog.d/eblurhash.deps @@ -0,0 +1 @@ +Replaced eblurhash with rinpatch_blurhash diff --git a/changelog.d/exile.deps b/changelog.d/exile.deps new file mode 100644 index 000000000..fa1b7a004 --- /dev/null +++ b/changelog.d/exile.deps @@ -0,0 +1 @@ +Add exile to replace custom process streaming implementation for calls to ffmpeg diff --git a/changelog.d/floki.deps b/changelog.d/floki.deps new file mode 100644 index 000000000..35f70f6f7 --- /dev/null +++ b/changelog.d/floki.deps @@ -0,0 +1 @@ +Update Floki to 0.3.5 diff --git a/changelog.d/http_signatures.deps b/changelog.d/http_signatures.deps new file mode 100644 index 000000000..9ae1cd75a --- /dev/null +++ b/changelog.d/http_signatures.deps @@ -0,0 +1 @@ +Update http-signatures to 0.1.2 diff --git a/changelog.d/phoenix.deps b/changelog.d/phoenix.deps new file mode 100644 index 000000000..62dd9d1b8 --- /dev/null +++ b/changelog.d/phoenix.deps @@ -0,0 +1 @@ +Update Phoenix to 1.7.3 diff --git a/changelog.d/promex.change b/changelog.d/promex.deps similarity index 100% rename from changelog.d/promex.change rename to changelog.d/promex.deps diff --git a/changelog.d/vix.deps b/changelog.d/vix.deps new file mode 100644 index 000000000..68c361760 --- /dev/null +++ b/changelog.d/vix.deps @@ -0,0 +1 @@ +Add Vix for image processing with libvips to replace some usage of ImageMagick