apache-airflow: 2.4.1 -> 2.4.3
Includes a patch to revert an upstream commit in order to get yarn to fetch packages without errors. Also, use the more correct forceFetchGit=true rather than leaveDotGit=true to fetch sources from github using the git protocol (needed to get tests, which aren't present in the tarball). leaveDotGit is not fully deterministic and this was causing sha256 mismatches for some people. Fixes #201763
This commit is contained in:
Graham Bennett
parent
73eab78fd8
commit
aef58508e5
|
|
@ -0,0 +1,51 @@
|
|||
From eca202d2893c9f2f91628ad6244b52cf7880bfcf Mon Sep 17 00:00:00 2001
|
||||
From: Graham Bennett <graham@grahambennett.org>
|
||||
Date: Mon, 21 Nov 2022 15:39:54 +0000
|
||||
Subject: [PATCH] Revert "fix yarn warning from d3-color (#27139)"
|
||||
|
||||
This reverts commit b9e133e40c2848b0d555051a99bf8d2816fd28a7.
|
||||
---
|
||||
airflow/www/package.json | 3 ---
|
||||
airflow/www/yarn.lock | 13 +++++++++----
|
||||
2 files changed, 9 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/airflow/www/package.json b/airflow/www/package.json
|
||||
index f694089ee6..3d37ad4c46 100644
|
||||
--- a/airflow/www/package.json
|
||||
+++ b/airflow/www/package.json
|
||||
@@ -120,8 +120,5 @@
|
||||
"redoc": "^2.0.0-rc.72",
|
||||
"type-fest": "^2.17.0",
|
||||
"url-search-params-polyfill": "^8.1.0"
|
||||
- },
|
||||
- "resolutions": {
|
||||
- "d3-color": "^3.1.0"
|
||||
}
|
||||
}
|
||||
diff --git a/airflow/www/yarn.lock b/airflow/www/yarn.lock
|
||||
index bafd63a368..dad0ebabab 100644
|
||||
--- a/airflow/www/yarn.lock
|
||||
+++ b/airflow/www/yarn.lock
|
||||
@@ -4518,10 +4518,15 @@ d3-collection@1, d3-collection@^1.0.4:
|
||||
resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.7.tgz#349bd2aa9977db071091c13144d5e4f16b5b310e"
|
||||
integrity sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A==
|
||||
|
||||
-d3-color@1, "d3-color@1 - 2", d3-color@^3.1.0:
|
||||
- version "3.1.0"
|
||||
- resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-3.1.0.tgz#395b2833dfac71507f12ac2f7af23bf819de24e2"
|
||||
- integrity sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==
|
||||
+d3-color@1:
|
||||
+ version "1.4.1"
|
||||
+ resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.1.tgz#c52002bf8846ada4424d55d97982fef26eb3bc8a"
|
||||
+ integrity sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q==
|
||||
+
|
||||
+"d3-color@1 - 2":
|
||||
+ version "2.0.0"
|
||||
+ resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-2.0.0.tgz#8d625cab42ed9b8f601a1760a389f7ea9189d62e"
|
||||
+ integrity sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ==
|
||||
|
||||
d3-contour@1:
|
||||
version "1.3.2"
|
||||
--
|
||||
2.37.3
|
||||
|
||||
|
|
@ -78,15 +78,16 @@
|
|||
, enabledProviders ? []
|
||||
}:
|
||||
let
|
||||
version = "2.4.1";
|
||||
version = "2.4.3";
|
||||
|
||||
airflow-src = fetchFromGitHub rec {
|
||||
owner = "apache";
|
||||
repo = "airflow";
|
||||
rev = "refs/tags/${version}";
|
||||
# Required because the GitHub archive tarballs don't appear to include tests
|
||||
leaveDotGit = true;
|
||||
sha256 = "sha256-HpPL/ocV7hRhYXsjfXMYvlP83Vh15kXyjBgubsaqaE8=";
|
||||
# Download using the git protocol rather than using tarballs, because the
|
||||
# GitHub archive tarballs don't appear to include tests
|
||||
forceFetchGit = true;
|
||||
sha256 = "sha256-7E7Em6ZCWjxJiDKQ0j/vozUo58XsAxv8uW0dVVST4Ak=";
|
||||
};
|
||||
|
||||
# airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree.
|
||||
|
|
@ -225,7 +226,7 @@ buildPythonPackage rec {
|
|||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "colorlog>=4.0.2, <5.0" "colorlog" \
|
||||
--replace "flask-login>=0.6.2" "flask-login" \
|
||||
--replace "flask-appbuilder==4.1.4" "flask-appbuilder>=4.1.3" \
|
||||
--replace "pathspec~=0.9.0" "pathspec"
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
# Fix failing test on Hydra
|
||||
|
|
@ -283,11 +284,9 @@ buildPythonPackage rec {
|
|||
cd ./pkgs/development/python-modules/apache-airflow
|
||||
curl -O https://raw.githubusercontent.com/apache/airflow/$new_version/airflow/www/yarn.lock
|
||||
curl -O https://raw.githubusercontent.com/apache/airflow/$new_version/airflow/www/package.json
|
||||
# Note: for 2.3.4 a manual change was needed to get a fully resolved URL for
|
||||
# caniuse-lite@1.0.30001312 (with the sha after the #). The error from yarn
|
||||
# was 'Can't make a request in offline mode' from yarn. Corrected install by
|
||||
# manually running yarn add caniuse-lite@1.0.30001312 and copying the
|
||||
# requisite section from the generated yarn.lock.
|
||||
# Revert this commit which seems to break with our version of yarn
|
||||
# https://github.com/apache/airflow/commit/b9e133e40c2848b0d555051a99bf8d2816fd28a7
|
||||
patch -p3 < 0001-Revert-fix-yarn-warning-from-d3-color-27139.patch
|
||||
yarn2nix > yarn.nix
|
||||
|
||||
# update provider dependencies
|
||||
|
|
@ -298,8 +297,8 @@ buildPythonPackage rec {
|
|||
# You can (manually) test the web UI as follows:
|
||||
#
|
||||
# nix shell .#python3Packages.apache-airflow
|
||||
# airflow db reset # WARNING: this will wipe any existing db state you might have!
|
||||
# airflow db init
|
||||
# airflow reset -y # WARNING: this will wipe any existing db state you might have!
|
||||
# airflow standalone
|
||||
#
|
||||
# Then navigate to the localhost URL using the credentials printed, try
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -7166,14 +7166,7 @@ json5@^1.0.1:
|
|||
dependencies:
|
||||
minimist "^1.2.0"
|
||||
|
||||
json5@^2.1.2:
|
||||
version "2.2.0"
|
||||
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
|
||||
integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
|
||||
dependencies:
|
||||
minimist "^1.2.5"
|
||||
|
||||
json5@^2.2.1:
|
||||
json5@^2.1.2, json5@^2.2.1:
|
||||
version "2.2.1"
|
||||
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
|
||||
integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
|
||||
|
|
@ -7258,9 +7251,9 @@ loader-runner@^4.2.0:
|
|||
integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
|
||||
|
||||
loader-utils@^1.4.0:
|
||||
version "1.4.0"
|
||||
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
|
||||
integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
|
||||
version "1.4.1"
|
||||
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.1.tgz#278ad7006660bccc4d2c0c1578e17c5c78d5c0e0"
|
||||
integrity sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==
|
||||
dependencies:
|
||||
big.js "^5.2.2"
|
||||
emojis-list "^3.0.0"
|
||||
|
|
@ -7606,7 +7599,12 @@ minimist-options@4.1.0:
|
|||
is-plain-obj "^1.1.0"
|
||||
kind-of "^6.0.3"
|
||||
|
||||
minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
|
||||
minimist@^1.2.0:
|
||||
version "1.2.7"
|
||||
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
|
||||
integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
|
||||
|
||||
minimist@^1.2.5, minimist@^1.2.6:
|
||||
version "1.2.6"
|
||||
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
|
||||
integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
|
||||
|
|
|
|||
|
|
@ -7121,14 +7121,6 @@
|
|||
sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "json5___json5_2.2.0.tgz";
|
||||
path = fetchurl {
|
||||
name = "json5___json5_2.2.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz";
|
||||
sha512 = "f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "json5___json5_2.2.1.tgz";
|
||||
path = fetchurl {
|
||||
|
|
@ -7242,11 +7234,11 @@
|
|||
};
|
||||
}
|
||||
{
|
||||
name = "loader_utils___loader_utils_1.4.0.tgz";
|
||||
name = "loader_utils___loader_utils_1.4.1.tgz";
|
||||
path = fetchurl {
|
||||
name = "loader_utils___loader_utils_1.4.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz";
|
||||
sha512 = "qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==";
|
||||
name = "loader_utils___loader_utils_1.4.1.tgz";
|
||||
url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.1.tgz";
|
||||
sha512 = "1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -7673,6 +7665,14 @@
|
|||
sha512 = "Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "minimist___minimist_1.2.7.tgz";
|
||||
path = fetchurl {
|
||||
name = "minimist___minimist_1.2.7.tgz";
|
||||
url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz";
|
||||
sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "minimist___minimist_1.2.6.tgz";
|
||||
path = fetchurl {
|
||||
|
|
|
|||
Loading…
Reference in a new issue