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: aa053197deb8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2570da807715
Choose a head ref
  • 10 commits
  • 9 files changed
  • 2 contributors

Commits on Nov 28, 2018

  1. Copy the full SHA
    0e3c1e7 View commit details
  2. Copy the full SHA
    ab8bd6e View commit details
  3. Copy the full SHA
    b5d5855 View commit details
  4. Copy the full SHA
    fe5a7e5 View commit details
  5. Copy the full SHA
    e097b5e View commit details
  6. Copy the full SHA
    a6dc112 View commit details
  7. Copy the full SHA
    8b6b45c View commit details
  8. Copy the full SHA
    0b7522d View commit details
  9. Copy the full SHA
    0549e30 View commit details
  10. Merge pull request #51080 from costrouc/costrouc/uarray-init

    pythonPackages.uarray: init at 0.4
    worldofpeace authored Nov 28, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    2570da8 View commit details
21 changes: 16 additions & 5 deletions pkgs/development/python-modules/astunparse/default.nix
Original file line number Diff line number Diff line change
@@ -1,16 +1,27 @@
{ stdenv, fetchPypi, buildPythonPackage, six }:
{ stdenv
, fetchPypi
, buildPythonPackage
, six
, wheel
}:

buildPythonPackage rec {
pname = "astunparse";
version = "1.5.0";
version = "1.6.1";

src = fetchPypi {
inherit pname version;
sha256 = "1kc9lm2jvfcip3z8snj04dar5a9jh857a704m6lvcv4xclm3rpsm";
sha256 = "d27b16fb33dea0778c5a2c01801554eae0d3f8a8d6f604f15627589c3d6f11ca";
};
propagatedBuildInputs = [ six ];
doCheck = false; # no tests

propagatedBuildInputs = [ six wheel ];

# tests not included with pypi release
doCheck = false;

meta = with stdenv.lib; {
description = "This is a factored out version of unparse found in the Python source distribution";
homepage = https://github.com/simonpercivall/astunparse;
license = licenses.bsd3;
maintainers = with maintainers; [ jyp ];
};
24 changes: 24 additions & 0 deletions pkgs/development/python-modules/hopcroftkarp/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{ lib
, buildPythonPackage
, fetchPypi
}:

buildPythonPackage rec {
pname = "hopcroftkarp";
version = "1.2.4";

src = fetchPypi {
inherit pname version;
sha256 = "cc6fc7ad348bbe5c9451f8116845c46ae26290c92b2dd14690aae2d55ba5e3a6";
};

# tests fail due to bad package name
doCheck = false;

meta = with lib; {
description = "Implementation of HopcroftKarp's algorithm";
homepage = https://github.com/sofiat-olaosebikan/hopcroftkarp;
license = licenses.gpl1;
maintainers = [ maintainers.costrouc ];
};
}
33 changes: 33 additions & 0 deletions pkgs/development/python-modules/matchpy/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{ lib
, buildPythonPackage
, fetchPypi
, hopcroftkarp
, multiset
, pytest
, pytestrunner
, hypothesis
, setuptools_scm
, isPy27
}:

buildPythonPackage rec {
pname = "matchpy";
version = "0.4.6";
disabled = isPy27;

src = fetchPypi {
inherit pname version;
sha256 = "eefa1e50a10e1255db61bc2522a6768ad0701f8854859f293ebaa442286faadd";
};

buildInputs = [ setuptools_scm pytestrunner ];
checkInputs = [ pytest hypothesis ];
propagatedBuildInputs = [ hopcroftkarp multiset ];

meta = with lib; {
description = "A library for pattern matching on symbolic expressions";
homepage = https://github.com/HPAC/matchpy;
license = licenses.mit;
maintainers = [ maintainers.costrouc ];
};
}
27 changes: 27 additions & 0 deletions pkgs/development/python-modules/multiset/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{ lib
, buildPythonPackage
, fetchPypi
, setuptools_scm
, pytestrunner
, pytest
}:

buildPythonPackage rec {
pname = "multiset";
version = "2.1.1";

src = fetchPypi {
inherit pname version;
sha256 = "4801569c08bfcecfe7b0927b17f079c90f8607aca8fecaf42ded92b737162bc7";
};

buildInputs = [ setuptools_scm pytestrunner ];
checkInputs = [ pytest ];

meta = with lib; {
description = "An implementation of a multiset";
homepage = https://github.com/wheerd/multiset;
license = licenses.mit;
maintainers = [ maintainers.costrouc ];
};
}
41 changes: 41 additions & 0 deletions pkgs/development/python-modules/nbval/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{ lib
, buildPythonPackage
, fetchPypi
, coverage
, ipykernel
, jupyter_client
, nbformat
, pytest
, six
, glibcLocales
, matplotlib
, sympy
, pytestcov
}:

buildPythonPackage rec {
pname = "nbval";
version = "0.9.1";

src = fetchPypi {
inherit pname version;
sha256 = "3f18b87af4e94ccd073263dd58cd3eebabe9f5e4d6ab535b39d3af64811c7eda";
};

LC_ALL = "en_US.UTF-8";

buildInputs = [ glibcLocales ];
checkInputs = [ matplotlib sympy pytestcov ];
propagatedBuildInputs = [ coverage ipykernel jupyter_client nbformat pytest six ];

checkPhase = ''
pytest tests --current-env --ignore tests/test_timeouts.py
'';

meta = with lib; {
description = "A py.test plugin to validate Jupyter notebooks";
homepage = https://github.com/computationalmodelling/nbval;
license = licenses.bsd3;
maintainers = [ maintainers.costrouc ];
};
}
43 changes: 43 additions & 0 deletions pkgs/development/python-modules/perf/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{ lib
, buildPythonPackage
, fetchPypi
, six
, statistics
, pythonOlder
, nose
, psutil
, contextlib2
, mock
, unittest2
, isPy27
, python
}:

buildPythonPackage rec {
pname = "perf";
version = "1.5.1";

src = fetchPypi {
inherit pname version;
sha256 = "5aae76e58bd3edd0c50adcc7c16926ebb9ed8c0e5058b435a30d58c6bb0394a8";
};

checkInputs = [ nose psutil ] ++
lib.optionals isPy27 [ contextlib2 mock unittest2 ];
propagatedBuildInputs = [ six ] ++
lib.optionals (pythonOlder "3.4") [ statistics ];

# tests not included in pypi repository
doCheck = false;

checkPhase = ''
${python.interpreter} -m nose
'';

meta = with lib; {
description = "Python module to generate and modify perf";
homepage = https://github.com/vstinner/perf;
license = licenses.mit;
maintainers = [ maintainers.costrouc ];
};
}
25 changes: 25 additions & 0 deletions pkgs/development/python-modules/pytest-mypy/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytest
, mypy
}:

buildPythonPackage rec {
pname = "pytest-mypy";
version = "0.3.2";

src = fetchPypi {
inherit pname version;
sha256 = "acc653210e7d8d5c72845a5248f00fd33f4f3379ca13fe56cfc7b749b5655c3e";
};

propagatedBuildInputs = [ pytest mypy ];

meta = with lib; {
description = "Mypy static type checker plugin for Pytest";
homepage = https://github.com/dbader/pytest-mypy;
license = licenses.mit;
maintainers = [ maintainers.costrouc ];
};
}
44 changes: 44 additions & 0 deletions pkgs/development/python-modules/uarray/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{ lib
, buildPythonPackage
, fetchPypi
, matchpy
, numpy
, astunparse
, typing-extensions
, black
, pytest
, pytestcov
, numba
, nbval
, python
, isPy37
}:

buildPythonPackage rec {
pname = "uarray";
version = "0.4";
format = "flit";
# will have support soon see
# https://github.com/Quansight-Labs/uarray/pull/64
disabled = isPy37;

src = fetchPypi {
inherit pname version;
sha256 = "4ec88f477d803a914d58fdf83aeedfb1986305355775cf55525348c62cce9aa4";
};

checkInputs = [ pytest nbval pytestcov numba ];
propagatedBuildInputs = [ matchpy numpy astunparse typing-extensions black ];

checkPhase = ''
${python.interpreter} extract_readme_tests.py
pytest
'';

meta = with lib; {
description = "Universal array library";
homepage = https://github.com/Quansight-Labs/uarray;
license = licenses.bsd0;
maintainers = [ maintainers.costrouc ];
};
}
14 changes: 14 additions & 0 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
@@ -398,6 +398,8 @@ in {
inherit python;
});

hopcroftkarp = callPackage ../development/python-modules/hopcroftkarp { };

httpsig = callPackage ../development/python-modules/httpsig { };

i3ipc = callPackage ../development/python-modules/i3ipc { };
@@ -422,6 +424,8 @@ in {

markerlib = callPackage ../development/python-modules/markerlib { };

matchpy = callPackage ../development/python-modules/matchpy { };

monty = callPackage ../development/python-modules/monty { };

mininet-python = (toPythonModule (pkgs.mininet.override{ inherit python; })).py;
@@ -430,10 +434,14 @@ in {
mpi = pkgs.openmpi;
};

multiset = callPackage ../development/python-modules/multiset { };

mwclient = callPackage ../development/python-modules/mwclient { };

mwoauth = callPackage ../development/python-modules/mwoauth { };

nbval = callPackage ../development/python-modules/nbval { };

nest-asyncio = callPackage ../development/python-modules/nest-asyncio { };

neuron = pkgs.neuron.override {
@@ -480,6 +488,8 @@ in {

pdfx = callPackage ../development/python-modules/pdfx { };

perf = callPackage ../development/python-modules/perf { };

phonopy = callPackage ../development/python-modules/phonopy { };

pims = callPackage ../development/python-modules/pims { };
@@ -613,6 +623,8 @@ in {

pytesseract = callPackage ../development/python-modules/pytesseract { };

pytest-mypy = callPackage ../development/python-modules/pytest-mypy { };

pytest-tornado = callPackage ../development/python-modules/pytest-tornado { };

python-binance = callPackage ../development/python-modules/python-binance { };
@@ -3967,6 +3979,8 @@ in {

ua-parser = callPackage ../development/python-modules/ua-parser { };

uarray = callPackage ../development/python-modules/uarray { };

ukpostcodeparser = callPackage ../development/python-modules/ukpostcodeparser { };

umemcache = callPackage ../development/python-modules/umemcache {};