pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #284233 from fabaff/aocd-fix

aocd-example-parser: init at unstable-2023-12-17, python311Packages.aocd: refactor

authored by Fabian Affolter and committed by GitHub 8eda5881 36ef6802

+72 -31
unified split
+37
pkgs/development/python-modules/aocd-example-parser/default.nix
··· 1 + { lib 2 + , buildPythonPackage 3 + , fetchFromGitHub 4 + , flit-core 5 + , pythonOlder 6 + }: 7 + 8 + buildPythonPackage rec { 9 + pname = "aocd-example-parser"; 10 + version = "unstable-2023-12-17"; 11 + pyproject = true; 12 + 13 + disabled = pythonOlder "3.9"; 14 + 15 + src = fetchFromGitHub { 16 + owner = "wimglenn"; 17 + repo = "aocd-example-parser"; 18 + rev = "07330183f3e43401444fe17b08d72eb6168504e1"; 19 + hash = "sha256-iOxqzZj29aY/xyigir1KOU6GcBBvnlxEOBLHChEQjf4="; 20 + }; 21 + 22 + nativeBuildInputs = [ 23 + flit-core 24 + ]; 25 + 26 + # Circular dependency with aocd 27 + # pythonImportsCheck = [ 28 + # "aocd_example_parser" 29 + # ]; 30 + 31 + meta = with lib; { 32 + description = "Default implementation of an example parser plugin for advent-of-code-data"; 33 + homepage = "https://github.com/wimglenn/aocd-example-parser"; 34 + license = licenses.mit; 35 + maintainers = with maintainers; [ fab ]; 36 + }; 37 + }
+33 -31
pkgs/development/python-modules/aocd/default.nix
··· 1 1 { lib 2 2 , stdenv 3 + , aocd-example-parser 4 + , beautifulsoup4 3 5 , buildPythonPackage 4 6 , fetchFromGitHub 5 - , requests 6 - , pytestCheckHook 7 - , tzlocal 8 - , pytest-mock 7 + , numpy 8 + , pebble 9 + , pook 9 10 , pytest-freezegun 11 + , pytest-mock 10 12 , pytest-raisin 11 13 , pytest-socket 14 + , pytestCheckHook 15 + , python-dateutil 16 + , pythonOlder 17 + , requests 12 18 , requests-mock 13 - , pook 14 - , numpy 15 19 , rich 16 - , pebble 17 - , python-dateutil 18 - , termcolor 19 - , beautifulsoup4 20 20 , setuptools 21 - , pythonOlder 21 + , termcolor 22 + , tzlocal 22 23 }: 23 24 24 25 buildPythonPackage rec { 25 26 pname = "aocd"; 26 27 version = "2.0.1"; 27 - format = "pyproject"; 28 + pyproject = true; 28 29 29 - disabled = pythonOlder "3.7"; 30 + disabled = pythonOlder "3.9"; 30 31 31 32 src = fetchFromGitHub { 32 33 owner = "wimglenn"; ··· 35 36 hash = "sha256-YZvcR97uHceloqwoP+azaBmj3GLusYNbItLIaeJ3QD0="; 36 37 }; 37 38 39 + nativeBuildInputs = [ 40 + setuptools 41 + ]; 42 + 38 43 propagatedBuildInputs = [ 44 + aocd-example-parser 45 + beautifulsoup4 46 + pebble 39 47 python-dateutil 40 48 requests 49 + rich # for example parser aoce. must either be here or checkInputs 41 50 termcolor 42 - beautifulsoup4 43 - pebble 44 51 tzlocal 45 - setuptools 46 - rich # for example parser aoce. must either be here or checkInputs 52 + ]; 53 + 54 + nativeCheckInputs = [ 55 + numpy 56 + pook 57 + pytest-freezegun 58 + pytest-mock 59 + pytest-raisin 60 + pytest-socket 61 + pytestCheckHook 62 + requests-mock 47 63 ]; 48 64 49 65 # Too many failing tests ··· 83 99 "test_submit_puts_level1_by_default" 84 100 "test_cannot_submit_same_bad_answer_twice" 85 101 "test_submit_float_warns" 86 - ]; 87 - 88 - nativeCheckInputs = [ 89 - pytestCheckHook 90 - pytest-mock 91 - pytest-freezegun 92 - pytest-raisin 93 - pytest-socket 94 - ]; 95 - 96 - checkInputs = [ 97 - pook 98 - numpy 99 - requests-mock 100 102 ]; 101 103 102 104 pythonImportsCheck = [
+2
pkgs/top-level/python-packages.nix
··· 617 617 618 618 aocd = callPackage ../development/python-modules/aocd { }; 619 619 620 + aocd-example-parser = callPackage ../development/python-modules/aocd-example-parser { }; 621 + 620 622 apache-beam = callPackage ../development/python-modules/apache-beam { }; 621 623 622 624 apcaccess = callPackage ../development/python-modules/apcaccess { };