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

Commits on Mar 2, 2019

  1. pythonPackages.can: 3.0.0 -> 3.1.0

    @jluttine
    jluttine committed Mar 2, 2019
    Copy the full SHA
    0a41afa View commit details

  2. pythonPackages.XlsxWriter: enable tests

    @jluttine
    jluttine committed Mar 2, 2019
    Copy the full SHA
    36d5375 View commit details

  3. Merge pull request #56298 from jluttine/xlsxwriter-1.1.5 

    pythonPackages.XlsxWriter: enable tests and pythonPackages.can: 3.0.0 -> 3.1.0
    @dotlambda
    dotlambda authored Mar 2, 2019
    Copy the full SHA
    100ec6c View commit details
Showing with 28 additions and 14 deletions.
  1. +10 −4 pkgs/development/python-modules/XlsxWriter/default.nix
  2. +18 −10 pkgs/development/python-modules/can/default.nix
14 changes: 10 additions & 4 deletions pkgs/development/python-modules/XlsxWriter/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
{lib, buildPythonPackage, fetchPypi}:
{lib, buildPythonPackage, fetchFromGitHub}:

buildPythonPackage rec {

pname = "XlsxWriter";
version = "1.1.5";

src = fetchPypi {
inherit pname version;
sha256 = "de9ef46088489915eaaee00c7088cff93cf613e9990b46b933c98eb46f21b47f";
# PyPI release tarball doesn't contain tests so let's use GitHub. See:
# https://github.com/jmcnamara/XlsxWriter/issues/327
src = fetchFromGitHub{
owner = "jmcnamara";
repo = pname;
rev = "RELEASE_${version}";
sha256 = "13250y53mr0pki93sqscy2bx01fxh6b6wvvj6m95ky0wqrrbmg39";
};

meta = {
@@ -15,4 +20,5 @@ buildPythonPackage rec {
maintainers = with lib.maintainers; [ jluttine ];
license = lib.licenses.bsd2;
};

}
28 changes: 18 additions & 10 deletions pkgs/development/python-modules/can/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,37 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchFromGitHub
, pythonOlder
, wrapt
, typing
, pyserial
, nose
, mock
, hypothesis
, future
, pytest
, pytest-timeout }:

buildPythonPackage rec {
pname = "python-can";
version = "3.0.0";
version = "3.1.0";

src = fetchPypi {
inherit pname version;
sha256 = "0d2ddb3b663af51b11a4c7fb7a577c63302a831986239f82bb6af65efc065b07";
# PyPI tarball is missing some tests and is missing __init__.py in test
# directory causing the tests to fail. See:
# https://github.com/hardbyte/python-can/issues/518
src = fetchFromGitHub {
repo = pname;
owner = "hardbyte";
rev = "v${version}";
sha256 = "01lfsh7drm4qvv909x9i0vnhskdh27mcb5xa86sv9m3zfpq8cjis";
};

propagatedBuildInputs = [ wrapt pyserial ];
checkInputs = [ nose mock pytest pytest-timeout ];
propagatedBuildInputs = [ wrapt pyserial ] ++ lib.optional (pythonOlder "3.5") typing;
checkInputs = [ nose mock pytest pytest-timeout hypothesis future ];

# Add the scripts to PATH
checkPhase = ''
pytest -k "not test_writer_and_reader \
and not test_reader \
and not test_socketcan_on_ci_server"
PATH=$out/bin:$PATH pytest -c /dev/null
'';

meta = with lib; {