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

Commits on Oct 3, 2019

  1. python3Packages.asdf: 2.3.3 -> 2.4.2 

    Bump to fix the broken build of the package:

* Disable doctest as they're currently broken in our test env
* Loosen version constraint for `semantic_version` as it was only
  introduced to work around some deprecation warnings[1]

See also: https://hydra.nixos.org/build/102480957

ZHF #68361

[1] asdf-format/asdf@3446ae0

(cherry picked from commit 06041fd)
    @Ma27
    Ma27 committed Oct 3, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    joshka Josh McKinney
    GPG key ID: 722287396A903BC5
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5d4d45f View commit details
Showing with 12 additions and 2 deletions.
  1. +12 −2 pkgs/development/python-modules/asdf/default.nix
14 changes: 12 additions & 2 deletions pkgs/development/python-modules/asdf/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,18 +9,26 @@
, numpy
, isPy27
, astropy
, setuptools_scm
, setuptools
}:

buildPythonPackage rec {
pname = "asdf";
version = "2.3.3";
version = "2.4.2";
disabled = isPy27;

src = fetchPypi {
inherit pname version;
sha256 = "d02e936a83abd206e7bc65050d94e8848da648344dbec9e49dddc2bdc3bd6870";
sha256 = "1wlgx8469wwsczc2gjka9k1a03yzird67zg3va0kg8y6j1qmbwvg";
};

postPatch = ''
substituteInPlace setup.cfg \
--replace "semantic_version>=2.3.1,<=2.6.0" "semantic_version>=2.3.1" \
--replace "doctest_plus = enabled" ""
'';

checkInputs = [
pytest-astropy
astropy
@@ -32,6 +40,8 @@ buildPythonPackage rec {
jsonschema
six
numpy
setuptools_scm
setuptools
];

checkPhase = ''