python3Packages.apache-airflow: 2.3.3 -> 2.3.4

2 years ago · 5357d26981
parent 710042e3fa
commit 5357d26981
4 changed files with 12910 additions and 8223 deletions
--- a/pkgs/development/python-modules/apache-airflow/default.nix
+++ b/pkgs/development/python-modules/apache-airflow/default.nix
@ -11,15 +11,19 @@
 , cattrs
 , clickclick
 , colorlog
+, connexion
+, cron-descriptor
 , croniter
 , cryptography
 , dataclasses
+, deprecated
 , dill
 , flask
 , flask_login
-, flask-wtf
 , flask-appbuilder
 , flask-caching
+, flask-session
+, flask-wtf
 , GitPython
 , graphviz
 , gunicorn
@ -32,13 +36,16 @@
 , jinja2
 , jsonschema
 , lazy-object-proxy
+, linkify-it-py
 , lockfile
 , markdown
 , markupsafe
 , marshmallow-oneofschema
+, mdit-py-plugins
 , numpy
 , openapi-spec-validator
 , pandas
+, pathspec
 , pendulum
 , psutil
 , pygments
@ -58,6 +65,7 @@
 , tabulate
 , tenacity
 , termcolor
+, typing-extensions
 , unicodecsv
 , werkzeug
 , pytestCheckHook
@ -65,17 +73,24 @@
 , mkYarnPackage
 }:
 let
-  version = "2.3.3";
+  version = "2.3.4";

  airflow-src = fetchFromGitHub rec {
    owner = "apache";
    repo = "airflow";
    rev = "refs/tags/${version}";
-    sha256 = "sha256-N+6ljfSo6+UvSAnvDav6G0S49JZ1VJwxmaiKPV3/DjA=";
+    # Required because the GitHub archive tarballs don't appear to include tests
+    leaveDotGit = true;
+    sha256 = "sha256-rxvLyz/hvZ6U8QKy9MiVofU0qeeo7OHctAj2PkxLh2c=";
  };

  # airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree.
  # This replicates this shell script, fixing bugs in yarn.lock and package.json
+  # To update yarn.lock and package.json:
+  # cd pkgs/development/python-modules/apache-airflow
+  # curl -O https://raw.githubusercontent.com/apache/airflow/$version/airflow/www/yarn.lock
+  # curl -O https://raw.githubusercontent.com/apache/airflow/$version/airflow/www/package.json
+  # yarn2nix > yarn.nix

  airflow-frontend = mkYarnPackage {
    name = "airflow-frontend";
@ -87,6 +102,12 @@ let

    distPhase = "true";

+    # The webpack license plugin tries to create /licenses when given the
+    # original relative path
+    postPatch = ''
+      sed -i 's!../../../../licenses/LICENSES-ui.txt!licenses/LICENSES-ui.txt!' webpack.config.js
+    '';
+
    configurePhase = ''
      cp -r $node_modules node_modules
    '';
@ -119,14 +140,18 @@ buildPythonPackage rec {
    cattrs
    clickclick
    colorlog
+    connexion
+    cron-descriptor
    croniter
    cryptography
+    deprecated
    dill
    flask
    flask-appbuilder
    flask-caching
-    flask_login
+    flask-session
    flask-wtf
+    flask_login
    GitPython
    graphviz
    gunicorn
@ -138,13 +163,16 @@ buildPythonPackage rec {
    jinja2
    jsonschema
    lazy-object-proxy
+    linkify-it-py
    lockfile
    markdown
    markupsafe
    marshmallow-oneofschema
+    mdit-py-plugins
    numpy
    openapi-spec-validator
    pandas
+    pathspec
    pendulum
    psutil
    pygments
@ -163,6 +191,7 @@ buildPythonPackage rec {
    tabulate
    tenacity
    termcolor
+    typing-extensions
    unicodecsv
    werkzeug
  ] ++ lib.optionals (pythonOlder "3.7") [
@ -184,25 +213,8 @@ buildPythonPackage rec {

  postPatch = ''
    substituteInPlace setup.cfg \
-      --replace "attrs>=20.0, <21.0" "attrs" \
-      --replace "cattrs~=1.1, <1.7.0" "cattrs" \
-      --replace "colorlog>=4.0.2, <6.0" "colorlog" \
-      --replace "croniter>=0.3.17, <1.1" "croniter" \
-      --replace "docutils<0.17" "docutils" \
-      --replace "flask-login>=0.3, <0.5" "flask-login" \
-      --replace "flask-wtf>=0.14.3, <0.15" "flask-wtf" \
-      --replace "flask>=1.1.0, <2.0" "flask" \
-      --replace "importlib_resources~=1.4" "importlib_resources" \
-      --replace "itsdangerous>=1.1.0, <2.0" "itsdangerous" \
-      --replace "markupsafe>=1.1.1, <2.0" "markupsafe" \
-      --replace "pyjwt<2" "pyjwt" \
-      --replace "python-slugify>=3.0.0,<5.0" "python-slugify" \
-      --replace "sqlalchemy_jsonfield~=1.0" "sqlalchemy-jsonfield" \
-      --replace "tenacity~=6.2.0" "tenacity" \
-      --replace "werkzeug~=1.0, >=1.0.1" "werkzeug"
-
-    substituteInPlace tests/core/test_core.py \
-      --replace "/bin/bash" "${stdenv.shell}"
+      --replace "colorlog>=4.0.2, <5.0" "colorlog" \
+      --replace "flask-login>=0.6.2" "flask-login"
  '' + lib.optionalString stdenv.isDarwin ''
    # Fix failing test on Hydra
    substituteInPlace airflow/utils/db.py \
@ -214,7 +226,11 @@ buildPythonPackage rec {
    "--prefix PYTHONPATH : $PYTHONPATH"
  ];

-  preCheck = ''
+  pythonImportsCheck = [
+    "airflow"
+  ];
+
+  checkPhase = ''
    export HOME=$(mktemp -d)
    export AIRFLOW_HOME=$HOME
    export AIRFLOW__CORE__UNIT_TEST_MODE=True
@ -242,8 +258,6 @@ buildPythonPackage rec {
    description = "Programmatically author, schedule and monitor data pipelines";
    homepage = "https://airflow.apache.org/";
    license = licenses.asl20;
-    maintainers = with maintainers; [ bhipple costrouc ingenieroariel ];
-    # requires extremely outdated versions of multiple dependencies
-    broken = true;
+    maintainers = with maintainers; [ bhipple costrouc gbpdt ingenieroariel ];
  };
 }
--- a/pkgs/development/python-modules/apache-airflow/package.json
+++ b/pkgs/development/python-modules/apache-airflow/package.json
@ -1,14 +1,14 @@
 {
-  "name": "airflow-frontend",
-  "version": "2.1.1rc1",
+  "name": "airflow-www",
+  "version": "1.0.0",
  "description": "Apache Airflow is a platform to programmatically author, schedule and monitor workflows.",
  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "dev": "NODE_ENV=dev webpack --watch --colors --progress --debug --output-pathinfo --devtool eval-cheap-source-map --mode development",
-    "prod": "NODE_ENV=production node --max_old_space_size=4096 ./node_modules/webpack/bin/webpack.js -p --colors --progress",
-    "build": "NODE_ENV=production webpack --colors --progress",
-    "lint": "eslint --ignore-path=.eslintignore --ext .js,.html .",
-    "lint:fix": "eslint --fix --ignore-path=.eslintignore --ext .js,.html ."
+    "test": "jest",
+    "dev": "NODE_ENV=development webpack --watch --progress --devtool eval-cheap-source-map --mode development",
+    "prod": "NODE_ENV=production node --max_old_space_size=4096 ./node_modules/webpack/bin/webpack.js --mode production --progress",
+    "build": "NODE_ENV=production webpack --progress --mode production",
+    "lint": "eslint --ignore-path=.eslintignore --ext .js,.jsx,.ts,.tsx . && tsc --noEmit",
+    "lint:fix": "eslint --fix --ignore-path=.eslintignore --ext .js,.jsx,.ts,.tsx . && tsc --noEmit"
  },
  "author": "Apache",
  "license": "Apache-2.0",
@ -28,53 +28,82 @@
    "flask"
  ],
  "devDependencies": {
-    "babel": "^6.23.0",
-    "babel-core": "^6.26.3",
-    "babel-eslint": "^10.1.0",
+    "@babel/core": "^7.18.5",
+    "@babel/eslint-parser": "^7.18.2",
+    "@babel/plugin-transform-runtime": "^7.16.0",
+    "@babel/preset-env": "^7.16.0",
+    "@babel/preset-react": "^7.16.0",
+    "@babel/preset-typescript": "^7.17.12",
+    "@testing-library/jest-dom": "^5.16.0",
+    "@testing-library/react": "^13.0.0",
+    "@types/react": "^18.0.12",
+    "@types/react-dom": "^18.0.5",
+    "@typescript-eslint/eslint-plugin": "^5.13.0",
+    "@typescript-eslint/parser": "^5.0.0",
+    "babel-jest": "^27.3.1",
    "babel-loader": "^8.1.0",
-    "babel-plugin-css-modules-transform": "^1.6.1",
-    "babel-polyfill": "^6.26.0",
    "clean-webpack-plugin": "^3.0.0",
    "copy-webpack-plugin": "^6.0.3",
-    "css-loader": "^3.4.2",
-    "eslint": "^7.5.0",
-    "eslint-config-airbnb-base": "^14.2.0",
+    "css-loader": "5.2.7",
+    "css-minimizer-webpack-plugin": "^4.0.0",
+    "eslint": "^8.6.0",
+    "eslint-config-airbnb": "^19.0.4",
+    "eslint-config-airbnb-typescript": "^17.0.0",
    "eslint-plugin-html": "^6.0.2",
-    "eslint-plugin-import": "^2.22.0",
+    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-jsx-a11y": "^6.5.0",
    "eslint-plugin-node": "^11.1.0",
    "eslint-plugin-promise": "^4.2.1",
+    "eslint-plugin-react": "^7.30.0",
+    "eslint-plugin-react-hooks": "^4.5.0",
    "eslint-plugin-standard": "^4.0.1",
    "file-loader": "^6.0.0",
    "imports-loader": "^1.1.0",
-    "mini-css-extract-plugin": "1.6.0",
+    "jest": "^27.3.1",
+    "mini-css-extract-plugin": "^1.6.2",
+    "moment": "^2.29.3",
    "moment-locales-webpack-plugin": "^1.2.0",
-    "optimize-css-assets-webpack-plugin": "6.0.0",
+    "nock": "^13.2.4",
    "style-loader": "^1.2.1",
    "stylelint": "^13.6.1",
    "stylelint-config-standard": "^20.0.0",
+    "terser-webpack-plugin": "<5.0.0",
+    "typescript": "^4.6.3",
    "url-loader": "4.1.0",
-    "webpack": "^4.16.3",
-    "webpack-cli": "^3.1.0",
-    "webpack-manifest-plugin": "^2.2.0"
+    "webpack": "^5.73.0",
+    "webpack-cli": "^4.0.0",
+    "webpack-license-plugin": "^4.2.1",
+    "webpack-manifest-plugin": "^4.0.0"
  },
  "dependencies": {
+    "@chakra-ui/react": "^2.2.0",
+    "@emotion/cache": "^11.9.3",
+    "@emotion/react": "^11.9.3",
+    "@emotion/styled": "^11",
+    "axios": "^0.26.0",
    "bootstrap-3-typeahead": "^4.0.2",
+    "camelcase-keys": "^7.0.0",
    "codemirror": "^5.59.1",
    "d3": "^3.4.4",
    "d3-shape": "^2.1.0",
    "d3-tip": "^0.9.1",
    "dagre-d3": "^0.6.4",
-    "datatables.net": "^1.10.23",
-    "datatables.net-bs": "^1.10.23",
+    "datatables.net": "^1.11.4",
+    "datatables.net-bs": "^1.11.4",
    "eonasdan-bootstrap-datetimepicker": "^4.17.47",
-    "jquery": ">=3.4.0",
-    "jshint": "^2.12.0",
-    "moment-timezone": "^0.5.28",
+    "framer-motion": "^6.0.0",
+    "jquery": ">=3.5.0",
+    "jshint": "^2.13.4",
+    "lodash": "^4.17.21",
+    "moment-timezone": "^0.5.34",
    "nvd3": "^1.8.6",
-    "redoc": "^2.0.0-rc.48",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0",
+    "react-icons": "^4.3.1",
+    "react-query": "^3.39.1",
+    "react-router-dom": "^6.3.0",
+    "react-table": "^7.8.0",
+    "redoc": "^2.0.0-rc.72",
    "url-search-params-polyfill": "^8.1.0"
-  },
-  "resolutions": {
-    "lodash": "^4.17.21"
  }
 }
--- a/pkgs/development/python-modules/apache-airflow/yarn.lock
+++ b/pkgs/development/python-modules/apache-airflow/yarn.lock
--- a/pkgs/development/python-modules/apache-airflow/yarn.nix
+++ b/pkgs/development/python-modules/apache-airflow/yarn.nix