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: aafb982e032d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: eed30dfa5c87
Choose a head ref
  • 1 commit
  • 1 file changed
  • 2 contributors

Commits on Jan 11, 2020

  1. pythonPackages.measurement: now python3 only 

    Upstream has dropped python2 support and updated their build dependencies as of
the 3.0 version; see here for changelog:
https://github.com/coddingtonbear/python-measurement/releases

Co-Authored-By: Jon <jonringer@users.noreply.github.com>
    @bhipple
    bhipple and Jon committed Jan 11, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    MichaReiser Micha Reiser
    SSH Key Fingerprint: ecGsN1ElBc6rDn4Ge3zV90y0fffKRH+1PNbJCxfpPEs
    Verified
    Learn about vigilant mode
    Copy the full SHA
    eed30df View commit details
Showing with 16 additions and 5 deletions.
  1. +16 −5 pkgs/development/python-modules/measurement/default.nix
21 changes: 16 additions & 5 deletions pkgs/development/python-modules/measurement/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,26 @@
{ lib, fetchPypi, buildPythonPackage, pbr, six, sympy }:
{ lib, fetchFromGitHub, buildPythonPackage, isPy3k
, sympy, pytest, pytestrunner, sphinx, setuptools_scm }:

buildPythonPackage rec {
pname = "measurement";
version = "3.2.0";

src = fetchPypi {
inherit pname version;
sha256 = "352b20f7f0e553236af7c5ed48d091a51cf26061c1a063f46b31706ff7c0d57a";
disabled = !isPy3k;

src = fetchFromGitHub {
owner = "coddingtonbear";
repo = "python-measurement";
rev = version;
sha256 = "1mk9qg1q4cnnipr6xa72i17qvwwhz2hd8p4vlsa9gdzrcv4vr8h9";
};

propagatedBuildInputs = [ pbr six sympy ];
postPatch = ''
sed -i 's|use_scm_version=True|version="${version}"|' setup.py
'';

checkInputs = [ pytest pytestrunner ];
nativeBuildInputs = [ sphinx setuptools_scm ];
propagatedBuildInputs = [ sympy ];

meta = with lib; {
description = "Use and manipulate unit-aware measurement objects in Python";