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: f1a7d738e33d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 22c007040986
Choose a head ref
  • 5 commits
  • 7 files changed
  • 1 contributor

Commits on Oct 26, 2019

  1. python38Packages.boto: disable tests for py38 

    Hmac logic has changed, and upstream no longer maintaining package
    Jonathan Ringer committed Oct 26, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    dadada Tim Schubert
    GPG key ID: EEB8D1CE62C4DFEA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1c28160 View commit details

  2. python3Packages.cheroot: fix tests 

    patches no longer needed
    Jonathan Ringer committed Oct 26, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    dadada Tim Schubert
    GPG key ID: EEB8D1CE62C4DFEA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    40abb6f View commit details

  3. pythonPackages.bitarray: fix build 

    remove obsolete patch
    Jonathan Ringer committed Oct 26, 2019
    Copy the full SHA
    20e823b View commit details

  4. pythonPackages.GitPython: disable python2 

    no longer supported
    Jonathan Ringer committed Oct 26, 2019
    Copy the full SHA
    a7a6b74 View commit details

  5. pythonPackages.testfixtures: 6.3.10 -> 6.10.0

    Jonathan Ringer committed Oct 26, 2019
    Copy the full SHA
    22c0070 View commit details
1 change: 1 addition & 0 deletions pkgs/development/python-modules/GitPython/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@
buildPythonPackage rec {
version = "3.0.4";
pname = "GitPython";
disabled = isPy27; # no longer supported

src = fetchPypi {
inherit pname version;
106 changes: 0 additions & 106 deletions pkgs/development/python-modules/bitarray/0001-Buffer-Protocol-Py3.patch
View file

This file was deleted.

3 changes: 0 additions & 3 deletions pkgs/development/python-modules/bitarray/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,9 +9,6 @@ buildPythonPackage rec {
sha256 = "3eb500f8b9cde19e14472fcbee0195dbf0fbac006f8406a03f0cfb495dff20a0";
};

# Delete once https://github.com/ilanschnell/bitarray/pull/55 is merged
patches = [ ./0001-Buffer-Protocol-Py3.patch ];

meta = with lib; {
description = "Efficient arrays of booleans";
homepage = https://github.com/ilanschnell/bitarray;
2 changes: 2 additions & 0 deletions pkgs/development/python-modules/boto/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ pkgs
, buildPythonPackage
, fetchPypi
, isPy38
, python
, nose
, mock
@@ -21,6 +22,7 @@ buildPythonPackage rec {
${python.interpreter} tests/test.py default
'';

doCheck = (!isPy38); # hmac functionality has changed
checkInputs = [ nose mock ];
propagatedBuildInputs = [ requests httpretty ];

2 changes: 0 additions & 2 deletions pkgs/development/python-modules/cheroot/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,8 +15,6 @@ buildPythonPackage rec {
sha256 = "5b525b3e4a755adf78070ab54c1821fb860d4255a9317dba2b88eb2df2441cff";
};

patches = [ ./tests.patch ];

nativeBuildInputs = [ setuptools_scm setuptools-scm-git-archive ];

propagatedBuildInputs = [ more-itertools six backports_functools_lru_cache ];
45 changes: 0 additions & 45 deletions pkgs/development/python-modules/cheroot/tests.patch
View file

This file was deleted.

19 changes: 6 additions & 13 deletions pkgs/development/python-modules/testfixtures/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
{ stdenv, buildPythonPackage, fetchPypi, fetchpatch
, mock, pytest, sybil, zope_component }:
{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, isPy27
, mock, pytest, sybil, zope_component, twisted }:

buildPythonPackage rec {
pname = "testfixtures";
version = "6.3.0";
version = "6.10.0";

src = fetchPypi {
inherit pname version;
sha256 = "1x16xkw483nb1ngv74s7lgaj514pb1ldklal7kb7iwqbxcgnrh2k";
sha256 = "1kiv60i0s67v34x28j6cshby7n7mbhd7a7val639yvvlh1f0q8wx";
};

checkInputs = [ pytest mock sybil zope_component ];

patches = [
# Fix tests for Python 3.7. Remove with the next release
(fetchpatch {
url = https://github.com/Simplistix/testfixtures/commit/6e8807543b804946aba58e2c9e92f5bdc3656a57.patch;
sha256 = "1584jz2qz04arx8z8f6d1l1vab7gi38k3akzm223rmp7j4m7yrii";
})
];
checkInputs = [ pytest mock sybil zope_component twisted ];

doCheck = !isPy27;
checkPhase = ''
# django is too much hasle to setup at the moment
pytest -W ignore::DeprecationWarning --ignore=testfixtures/tests/test_django testfixtures/tests