Unverified Commit 5cd122b0 authored by Robert Schütz's avatar Robert Schütz Committed by GitHub
Browse files

Merge pull request #245908 from dotlambda/lektor-3.4.0b8 

python310Packages.lektor: 3.4.0b4 -> 3.4.0b8
parents 847aceb2 8850d389

pkgs/development/python-modules/lektor/default.nix

+33 −14
Original line number Diff line number Diff line
@@ -2,11 +2,13 @@ 
, babel

, buildPythonPackage

, click

, deprecated

, exifread

, fetchFromGitHub

, fetchNpmDeps

, filetype

, flask

, hatch-vcs

, hatchling

, importlib-metadata

, inifile

, jinja2
@@ -14,8 +16,10 @@ 
, marshmallow

, marshmallow-dataclass

, mistune

, nodejs

, npmHooks

, pillow

, pip

, pyopenssl

, pytest-click

, pytest-mock

, pytest-pylint
@@ -25,15 +29,13 @@ 
, python-slugify

, pytz

, requests

, setuptools

, typing-inspect

, watchdog

, watchfiles

, werkzeug

}:



buildPythonPackage rec {

  pname = "lektor";

  version = "3.4.0b4";

  version = "3.4.0b8";

  format = "pyproject";



  disabled = pythonOlder "3.7";
@@ -42,13 +44,28 @@ buildPythonPackage rec { 
    owner = "lektor";

    repo = pname;

    rev = "refs/tags/v${version}";

    hash = "sha256-O0bTmJqRymrQuHW19Y7/Kp+2XlbmDzcjl/jDACDlCSk=";

    hash = "sha256-FtmRW4AS11zAX2jvGY8XTsPrN3mhHkIWoFY7sXmqG/U=";

  };



  npmDeps = fetchNpmDeps {

    src = "${src}/frontend";

    hash = "sha256-Z7LP9rrVSzKoLITUarsnRbrhIw7W7TZSZUgV/OT+m0M=";

  };



  npmRoot = "frontend";



  nativeBuildInputs = [

    hatch-vcs

    hatchling

    nodejs

    npmHooks.npmConfigHook

  ];



  env.SETUPTOOLS_SCM_PRETEND_VERSION = version;



  propagatedBuildInputs = [

    babel

    click

    deprecated

    exifread

    filetype

    flask
@@ -58,17 +75,16 @@ buildPythonPackage rec { 
    marshmallow

    marshmallow-dataclass

    mistune

    pillow

    pip

    pyopenssl

    python-slugify

    pytz

    requests

    setuptools

    typing-inspect

    watchdog

    watchfiles

    werkzeug

  ] ++ lib.optionals (pythonOlder "3.8") [

    importlib-metadata

  ] ++ lib.optionals (pythonOlder "3.9") [

    pytz

  ];



  nativeCheckInputs = [
@@ -86,8 +102,11 @@ buildPythonPackage rec { 
  ];



  disabledTests = [

    # Test requires network access

    # Tests require network access

    "test_path_installed_plugin_is_none"

    "test_VirtualEnv_run_pip_install"

    # expects FHS paths

    "test_VirtualEnv_executable"

  ];



  meta = with lib; {