Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2db1225fb522
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 63b38a097229
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 25, 2021

  1. pythonPackages.pytest-check: 0.3.9 -> 1.0.1

    @fgaz
    fgaz committed Jan 25, 2021

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    cole-h Cole Helbling
    GPG key ID: B37E0F2371016A4C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0af3473 View commit details

  2. staticjinja: 0.4.0 -> 1.0.3

    @fgaz
    fgaz committed Jan 25, 2021
    Copy the full SHA
    7e33a28 View commit details

  3. Merge pull request #110776 from fgaz/staticjinja/1.0.3

    @SuperSandro2000
    SuperSandro2000 authored Jan 25, 2021
    Copy the full SHA
    63b38a0 View commit details
Showing with 15 additions and 6 deletions.
  1. +2 −2 pkgs/development/python-modules/pytest-check/default.nix
  2. +13 −4 pkgs/development/python-modules/staticjinja/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/pytest-check/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,12 +7,12 @@

buildPythonPackage rec {
pname = "pytest-check";
version = "0.3.9";
version = "1.0.1";

src = fetchPypi {
pname = "pytest_check";
inherit version;
sha256 = "0asrrz0fgk6wqffsz1ffd6z9xyw314fwh5bwjzcq75w8w1g4ass9";
sha256 = "1i01i5ab06ic11na13gcacrlcs2ab6rmaii0yz0x06z5ynnljn6s";
};

propagatedBuildInputs = [ pytest ];
17 changes: 13 additions & 4 deletions pkgs/development/python-modules/staticjinja/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,12 +6,16 @@
, easywatch
, jinja2
, pytestCheckHook
, pytest-check
, fetchPypi
, markdown
, sphinx
, sphinx_rtd_theme
}:

buildPythonPackage rec {
pname = "staticjinja";
version = "0.4.0";
version = "1.0.3";

disabled = isPy27; # 0.4.0 drops python2 support

@@ -21,7 +25,7 @@ buildPythonPackage rec {
owner = "staticjinja";
repo = pname;
rev = version;
sha256 = "0pysk8pzmcg1nfxz8m4i6bvww71w2zg6xp33zgg5vrf8yd2dfx9i";
sha256 = "12rpv5gv64i5j4w98wm1444xnnmarcn3pg783j3fkkzc58lk5wwj";
};

propagatedBuildInputs = [
@@ -32,13 +36,18 @@ buildPythonPackage rec {

checkInputs = [
pytestCheckHook
pytest-check
markdown
sphinx_rtd_theme
sphinx
];

# Import paths differ by a "build/lib" subdirectory, but the files are
# the same, so we ignore import mismatches.
preCheck = ''
# Import paths differ by a "build/lib" subdirectory, but the files are
# the same, so we ignore import mismatches.
export PY_IGNORE_IMPORTMISMATCH=1
# The tests need to find and call the installed staticjinja executable
export PATH="$PATH:$out/bin";
'';

meta = with lib; {