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: e37b8a65c14e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: eba59fc6d451
Choose a head ref

Commits on Nov 5, 2020

  1. python3Packages.browser-cookie3: fix deps

    Jonathan Ringer committed Nov 5, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    Copy the full SHA
    af7dbd1 View commit details
  2. python3Packages.dash_core_components: 1.12.1 -> 1.13.0

    Jonathan Ringer committed Nov 5, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    Copy the full SHA
    d2be8ca View commit details
  3. python3Packages.dash: 1.16.2 -> 1.17.0

    Jonathan Ringer committed Nov 5, 2020
    Copy the full SHA
    f914355 View commit details
  4. python3Packages.dash_table: 4.10.1 -> 4.11.0

    Jonathan Ringer committed Nov 5, 2020
    Copy the full SHA
    e66d23b View commit details
  5. python3Packages.update_checker: disable py2

    ```
    builder for '/nix/store/2qwl0rkdm2gx2byhpmw7lxyg5rprwqqk-python2.7-update_checker-0.18.0.drv' failed with exit code 1; last 10 log lines:
      no configure script, doing nothing
      building
      Executing setuptoolsBuildPhase
      Traceback (most recent call last):
        File "nix_run_setup", line 8, in <module>
          exec(compile(getattr(tokenize, 'open', open)(__file__).read().replace('\\r\\n', '\\n'), __file__, 'exec'))
        File "setup.py", line 9
          with open(f"{MODULE_NAME}.py") as fp:
                                      ^
      SyntaxError: invalid syntax
    ```
    Jonathan Ringer committed Nov 5, 2020
    Copy the full SHA
    3b8c801 View commit details
  6. python3Packages.sphinxcontrib-openapi: disable py2

    ```
    builder for '/nix/store/jz41wvwvkc6q55972ysdajm6k3vnv6r8-python2.7-sphinxcontrib-openapi-0.7.0.drv' failed with exit code 1; last 10 log lines:
      configuring
      no configure script, doing nothing
      building
      Executing setuptoolsBuildPhase
      Traceback (most recent call last):
        File "nix_run_setup", line 8, in <module>
          exec(compile(getattr(tokenize, 'open', open)(__file__).read().replace('\\r\\n', '\\n'), __file__, 'exec'))
        File "setup.py", line 10, in <module>
          with open(os.path.join(here, "README.rst"), "r", encoding="utf-8") as f:
      TypeError: 'encoding' is an invalid keyword argument for this function
    ```
    Jonathan Ringer committed Nov 5, 2020
    Copy the full SHA
    9c91541 View commit details
  7. python3Packages.pytest-flakes: disable py2

    Jonathan Ringer committed Nov 5, 2020
    Copy the full SHA
    9c2e038 View commit details
  8. Revert "python: patator: 0.7 -> 0.9"

    This reverts commit 5c1c22a.
    Jonathan Ringer committed Nov 5, 2020
    Copy the full SHA
    9bc0adc View commit details
  9. python3Packages.flask-cores: fix tests

    Jonathan Ringer committed Nov 5, 2020
    Copy the full SHA
    9bc584b View commit details
  10. python3Packages.amply: fix tests

    Jonathan Ringer committed Nov 5, 2020
    Copy the full SHA
    80f2e54 View commit details
  11. python3Packages.google-auth-oauthlib: disable python<3.6

    Jonathan Ringer committed Nov 5, 2020
    Copy the full SHA
    b566398 View commit details
  12. python3Packages.pyct: disable py2 tests

    Jonathan Ringer committed Nov 5, 2020
    Copy the full SHA
    e0a9a87 View commit details
  13. Copy the full SHA
    aba63f1 View commit details
  14. python3Packages.munkres: fix tests

    Jonathan Ringer committed Nov 5, 2020
    Copy the full SHA
    f94f401 View commit details
  15. python3Packages.py-multihash: mark broken, unmaintained

    Jonathan Ringer committed Nov 5, 2020
    Copy the full SHA
    2bda2b5 View commit details
  16. python3Packages.premailer: disable for py2

    Jonathan Ringer committed Nov 5, 2020
    Copy the full SHA
    ae841e3 View commit details
  17. python3Packages.pushover-complete: disable for py2

    Jonathan Ringer committed Nov 5, 2020
    Copy the full SHA
    2a30809 View commit details
  18. python3Packages.zope_copy: disable tests for py2

    Jonathan Ringer committed Nov 5, 2020
    Copy the full SHA
    6b11cc2 View commit details
  19. python3Packages.iterm2: make darwin only

    requires pyobjc package, which is only available for darwin
    Jonathan Ringer committed Nov 5, 2020
    Copy the full SHA
    8840cde View commit details
  20. python3Packages.nbconflux: disable for py2

    Jonathan Ringer committed Nov 5, 2020
    Copy the full SHA
    beacf73 View commit details
  21. python3Packages.jupytext: fix deps

    Jonathan Ringer committed Nov 5, 2020
    Copy the full SHA
    3122594 View commit details
  22. python3Packages.pycurl: disable for py2

    Jonathan Ringer committed Nov 5, 2020
    Copy the full SHA
    0e8acd7 View commit details
  23. python37Packages.sphinxcontrib-spelling: fix deps

    Jonathan Ringer committed Nov 5, 2020
    Copy the full SHA
    eba59fc View commit details
Showing with 56 additions and 27 deletions.
  1. +3 −4 pkgs/development/python-modules/amply/default.nix
  2. +3 −2 pkgs/development/python-modules/browser-cookie3/default.nix
  3. +2 −2 pkgs/development/python-modules/dash-core-components/default.nix
  4. +2 −2 pkgs/development/python-modules/dash-table/default.nix
  5. +2 −2 pkgs/development/python-modules/dash/default.nix
  6. +2 −2 pkgs/development/python-modules/flask-cors/default.nix
  7. +2 −0 pkgs/development/python-modules/google-auth-oauthlib/default.nix
  8. +1 −0 pkgs/development/python-modules/iterm2/default.nix
  9. +2 −0 pkgs/development/python-modules/jupytext/default.nix
  10. +2 −4 pkgs/development/python-modules/munkres/default.nix
  11. +2 −1 pkgs/development/python-modules/nbconflux/default.nix
  12. +2 −2 pkgs/development/python-modules/patator/default.nix
  13. +2 −1 pkgs/development/python-modules/premailer/default.nix
  14. +2 −0 pkgs/development/python-modules/pushover-complete/default.nix
  15. +1 −0 pkgs/development/python-modules/py-multihash/default.nix
  16. +2 −0 pkgs/development/python-modules/pyct/default.nix
  17. +2 −1 pkgs/development/python-modules/pycurl/default.nix
  18. +6 −2 pkgs/development/python-modules/pytest-flakes/default.nix
  19. +4 −0 pkgs/development/python-modules/requests-aws4auth/default.nix
  20. +2 −0 pkgs/development/python-modules/sphinxcontrib-openapi/default.nix
  21. +5 −1 pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
  22. +3 −1 pkgs/development/python-modules/update_checker/default.nix
  23. +2 −0 pkgs/development/python-modules/zope_copy/default.nix
7 changes: 3 additions & 4 deletions pkgs/development/python-modules/amply/default.nix
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
, setuptools_scm
, docutils
, pyparsing
, pytestCheckHook
}:

buildPythonPackage rec {
@@ -15,15 +16,13 @@ buildPythonPackage rec {
sha256 = "cb12dcb49d16b168c02be128a1527ecde50211e4bd94af76ff4e67707f5a2d38";
};

buildInputs = [ setuptools_scm ];
nativeBuildInputs = [ setuptools_scm ];
propagatedBuildInputs = [
docutils
pyparsing
];
checkInputs = [ pytestCheckHook ];

checkPhase = ''
python tests/test_amply.py
'';
pythonImportsCheck = [ "amply" ];

meta = with stdenv.lib; {
5 changes: 3 additions & 2 deletions pkgs/development/python-modules/browser-cookie3/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ lib, fetchPypi, buildPythonPackage, isPy3k, keyring, pbkdf2, pyaes}:
{ lib, fetchPypi, buildPythonPackage, isPy3k, lz4, keyring, pbkdf2, pycryptodome, pyaes}:

buildPythonPackage rec {
pname = "browser-cookie3";
version = "0.11.4";
@@ -10,7 +11,7 @@ buildPythonPackage rec {

disabled = !isPy3k;

propagatedBuildInputs = [ keyring pbkdf2 pyaes ];
propagatedBuildInputs = [ lz4 keyring pbkdf2 pyaes pycryptodome ];

# No tests implemented
doCheck = false;
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@

buildPythonPackage rec {
pname = "dash_core_components";
version = "1.12.1";
version = "1.13.0";

src = fetchPypi {
inherit pname version;
sha256 = "27f2ac612f5574dcd0d645f9302ceca5975bbdac6791865692e3ac51d0aec7f4";
sha256 = "f92025b12931539cdda2173f2b4cd077119cbabbf3ddf62333f6302fd0d8a3ac";
};

# No tests in archive
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/dash-table/default.nix
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@

buildPythonPackage rec {
pname = "dash_table";
version = "4.10.1";
version = "4.11.0";

src = fetchPypi {
inherit pname version;
sha256 = "1aa02180faef13434364286b60404d26164d1ce2779c765c9c52e6935991a4e9";
sha256 = "3170504a8626a9676b016c5ab456ab8c1fb1ea0206dcc2eddb8c4c6589216304";
};

# No tests in archive
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/dash/default.nix
Original file line number Diff line number Diff line change
@@ -16,13 +16,13 @@

buildPythonPackage rec {
pname = "dash";
version = "1.16.2";
version = "1.17.0";

src = fetchFromGitHub {
owner = "plotly";
repo = pname;
rev = "v${version}";
sha256 = "1krhwxlz8kpaklf5ii3h339id6c3139xzxxkq7mvvag330j6nbgg";
sha256 = "1fbnhpmkxavv6yirmhx7659q1y9bqynwjd1g6cscv1mfv9m59l60";
};

propagatedBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/flask-cors/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchPypi, buildPythonPackage
, nose, flask, six }:
, nose, flask, six, packaging }:

buildPythonPackage rec {
pname = "Flask-Cors";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
sha256 = "6bcfc100288c5d1bcb1dbb854babd59beee622ffd321e444b05f24d6d58466b8";
};

checkInputs = [ nose ];
checkInputs = [ nose packaging ];
propagatedBuildInputs = [ flask six ];

# Exclude test_acl_uncaught_exception_500 test case because is not compatible
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, isPy3k
, click
, mock
@@ -13,6 +14,7 @@
buildPythonPackage rec {
pname = "google-auth-oauthlib";
version = "0.4.2";
disabled = pythonOlder "3.6";

src = fetchPypi {
inherit pname version;
1 change: 1 addition & 0 deletions pkgs/development/python-modules/iterm2/default.nix
Original file line number Diff line number Diff line change
@@ -26,6 +26,7 @@ buildPythonPackage rec {
description = "Python interface to iTerm2's scripting API";
homepage = "https://github.com/gnachman/iTerm2";
license = licenses.gpl2;
platforms = platforms.darwin;
maintainers = with maintainers; [ jeremyschlatter ];
};
}
2 changes: 2 additions & 0 deletions pkgs/development/python-modules/jupytext/default.nix
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@
, nbformat
, pytest
, pyyaml
, toml
}:

buildPythonPackage rec {
@@ -17,6 +18,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
pyyaml
nbformat
toml
] ++ lib.optionals isPy27 [ mock ]; # why they put it in install_requires, who knows

checkInputs = [
6 changes: 2 additions & 4 deletions pkgs/development/python-modules/munkres/default.nix
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, isPy3k
, nose
, pytestCheckHook
}:

buildPythonPackage rec {
@@ -16,9 +16,7 @@ buildPythonPackage rec {
sha256 = "fc44bf3c3979dada4b6b633ddeeb8ffbe8388ee9409e4d4e8310c2da1792db03";
};

checkInputs = [ nose ];

checkPhase = "nosetests";
checkInputs = [ pytestCheckHook ];

meta = with stdenv.lib; {
homepage = "http://bmc.github.com/munkres/";
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/nbconflux/default.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{ lib, buildPythonPackage, fetchFromGitHub, nbconvert, pytest, requests, responses }:
{ lib, buildPythonPackage, fetchFromGitHub, isPy27, nbconvert, pytest, requests, responses }:

buildPythonPackage rec {
pname = "nbconflux";
version = "0.7.0";
disabled = isPy27; # no longer compatible with python 2 urllib

src = fetchFromGitHub {
owner = "Valassis-Digital-Media";
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/patator/default.nix
Original file line number Diff line number Diff line change
@@ -5,12 +5,12 @@

buildPythonPackage rec {
pname = "patator";
version = "0.9";
version = "0.7";
disabled = !(isPy3k);

src = fetchPypi {
inherit pname version;
sha256 = "68cb24bdc3042ee0d47a288b19a8b99a6c54bdbd4ddf0c5817d9b9ac0a0d8a15";
sha256 = "335e432e6cc591437e316ba8c1da935484ca39fc79e595ccf60ccd9166e965f1";
};

propagatedBuildInputs = [
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/premailer/default.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{ lib, buildPythonPackage, fetchPypi,
{ lib, buildPythonPackage, fetchPypi, isPy27,
cssselect, cssutils, lxml, mock, nose, requests, cachetools
}:

buildPythonPackage rec {
pname = "premailer";
version = "3.7.0";
disabled = isPy27; # no longer compatible with urllib

src = fetchPypi {
inherit pname version;
2 changes: 2 additions & 0 deletions pkgs/development/python-modules/pushover-complete/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, isPy27
, requests
, six
, tox
@@ -11,6 +12,7 @@
buildPythonPackage rec {
pname = "pushover-complete";
version = "1.1.1";
disabled = isPy27;

src = fetchPypi {
pname = "pushover_complete";
1 change: 1 addition & 0 deletions pkgs/development/python-modules/py-multihash/default.nix
Original file line number Diff line number Diff line change
@@ -45,5 +45,6 @@ buildPythonPackage rec {
homepage = "https://github.com/multiformats/py-multihash";
license = licenses.mit;
maintainers = with maintainers; [ rakesh4g ];
broken = true; # no longer compatible with base58, no updates in 5 years. Added 2020-11-05
};
}
2 changes: 2 additions & 0 deletions pkgs/development/python-modules/pyct/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, isPy27
, param
, pyyaml
, requests
@@ -16,6 +17,7 @@ buildPythonPackage rec {
sha256 = "23d7525b5a1567535c093aea4b9c33809415aa5f018dd77f6eb738b1226df6f7";
};

doCheck = !isPy27;
checkInputs = [ pytest ];
propagatedBuildInputs = [
param
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/pycurl/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ buildPythonPackage
, isPyPy
, fetchPypi
, pythonOlder
, curl
, openssl
, bottle
@@ -12,7 +13,7 @@
buildPythonPackage rec {
pname = "pycurl";
version = "7.43.0.6";
disabled = isPyPy; # https://github.com/pycurl/pycurl/issues/208
disabled = isPyPy || (pythonOlder "3.5"); # https://github.com/pycurl/pycurl/issues/208

src = fetchPypi {
inherit pname version;
8 changes: 6 additions & 2 deletions pkgs/development/python-modules/pytest-flakes/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
{ stdenv, buildPythonPackage, fetchPypi
, pytestpep8, pytest, pyflakes }:
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
, pytestpep8
, pytest
, pyflakes
}:

buildPythonPackage rec {
# upstream has abandoned project in favor of pytest-flake8
# retaining package to not break other packages
pname = "pytest-flakes";
version = "4.0.2";
disabled = pythonOlder "3.5";

src = fetchPypi {
inherit pname version;
4 changes: 4 additions & 0 deletions pkgs/development/python-modules/requests-aws4auth/default.nix
Original file line number Diff line number Diff line change
@@ -11,11 +11,15 @@ buildPythonPackage rec {

propagatedBuildInputs = [ requests ];

# pypi package no longer contains tests
doCheck = false;
checkPhase = ''
cd requests_aws4auth
${python.interpreter} test/requests_aws4auth_test.py
'';

pythonImportsCheck = [ "requests_aws4auth" ];

meta = {
description = "Amazon Web Services version 4 authentication for the Python Requests library.";
homepage = "https://github.com/sam-washington/requests-aws4auth";
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, isPy27
, setuptools_scm
, m2r
, pyyaml
@@ -11,6 +12,7 @@
buildPythonPackage rec {
pname = "sphinxcontrib-openapi";
version = "0.7.0";
disabled = isPy27;

src = fetchPypi {
inherit pname version;
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{ stdenv
, lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, importlib-metadata
, sphinx
, pyenchant
, pbr
@@ -15,7 +18,8 @@ buildPythonPackage rec {
sha256 = "c8250ff02e6033c3aeabc41e91dc185168fecefb0c5722aaa3e2055a829e1e4c";
};

propagatedBuildInputs = [ sphinx pyenchant pbr ];
propagatedBuildInputs = [ sphinx pyenchant pbr ]
++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];

# No tests included
doCheck = false;
4 changes: 3 additions & 1 deletion pkgs/development/python-modules/update_checker/default.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
{ stdenv, buildPythonPackage, fetchPypi, requests}:
{ stdenv, buildPythonPackage, fetchPypi, requests, isPy27
}:

buildPythonPackage rec {
pname = "update_checker";
version = "0.18.0";
disabled = isPy27;

src = fetchPypi {
inherit pname version;
2 changes: 2 additions & 0 deletions pkgs/development/python-modules/zope_copy/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, isPy27
, zope_interface
, zope_location
, zope_schema
@@ -18,6 +19,7 @@ buildPythonPackage rec {

propagatedBuildInputs = [ zope_interface ];

doCheck = !isPy27; # namespace conflicts
checkInputs = [ zope_location zope_schema ];

checkPhase = ''