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

Commits on Apr 11, 2020

  1. python.pkgs.tensorflow-probability: 0.7 -> 0.8.0 

    This unbreaks the build by updating to a newer version, adding new
dependencies and backporting some patches.

0.9 is released already, but that version is no longer compatible with
tf1. 0.8.0 is compatible with tf1 and tf2.
    @timokau
    timokau committed Apr 11, 2020
    Copy the full SHA
    04d3adb View commit details

  2. python.pkgs.arviz: 0.6.1 -> 0.7.0 

    Fixes a test failure that was caused by the numba update in
4362401.
    @timokau
    timokau committed Apr 11, 2020
    Copy the full SHA
    346197e View commit details

  3. python3.pkgs.pymc3: unbreak 

    The arviz and packaging dependencies are needed since the update to
pymc3 3.8.
    @timokau
    timokau committed Apr 11, 2020
    Copy the full SHA
    b7b33e2 View commit details

  4. Merge pull request #85027 from timokau/pymc3-unbreak 

    python3.pkgs.pymc3: unbreak; update arviz, tensorflow-probability
    @timokau
    timokau authored Apr 11, 2020
    Copy the full SHA
    8febf8b View commit details
18 changes: 14 additions & 4 deletions pkgs/development/python-modules/arviz/default.nix
View file
Original file line number Diff line number Diff line change
@@ -22,13 +22,13 @@

buildPythonPackage rec {
pname = "arviz";
version = "0.6.1";
version = "0.7.0";

src = fetchFromGitHub {
owner = "arviz-devs";
repo = "arviz";
rev = version;
sha256 = "1qc4piz18hfik32gj4v65ckwv516mppq2ac0jyqs21lhqfwbgv9w";
sha256 = "03hj7bkkj6kfqdk6ri2mp53wk4k7xpafxk01vgs6k9zg3rlnq7ny";
};

propagatedBuildInputs = [
@@ -69,8 +69,18 @@ buildPythonPackage rec {
# data_numpyro, data_pyro, data_pystan, and plots.
checkPhase = ''
cd arviz/tests/
HOME=$TMPDIR pytest test_{data_cmdstan,data_emcee,data,data_tfp,\
diagnostics,plot_utils,rcparams,stats,stats_utils,utils}.py
export HOME=$TMPDIR
pytest \
base_tests/test_data.py \
base_tests/test_diagnostics.py \
base_tests/test_plot_utils.py \
base_tests/test_rcparams.py \
base_tests/test_stats.py \
base_tests/test_stats_utils.py \
base_tests/test_utils.py \
external_tests/test_data_cmdstan.py \
external_tests/test_data_emcee.py \
external_tests/test_data_tfp.py
'';

meta = with lib; {
4 changes: 4 additions & 0 deletions pkgs/development/python-modules/pymc3/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,6 +9,8 @@
, tqdm
, six
, h5py
, arviz
, packaging
, pytest
, nose
, parameterized
@@ -37,6 +39,8 @@ buildPythonPackage rec {
tqdm
six
h5py
arviz
packaging
];

checkInputs = [
28 changes: 24 additions & 4 deletions pkgs/development/python-modules/tensorflow-probability/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
{ lib
, fetchFromGitHub
, fetchpatch
, buildBazelPackage
, buildPythonPackage
, python
, setuptools
, wheel
, absl-py
, tensorflow
, six
, numpy
, decorator
, cloudpickle
, gast
, hypothesis
, scipy
, matplotlib
@@ -18,7 +21,7 @@
}:

let
version = "0.7";
version = "0.8.0";
pname = "tensorflow_probability";

# first build all binaries and generate setup.py using bazel
@@ -28,21 +31,37 @@ let
src = fetchFromGitHub {
owner = "tensorflow";
repo = "probability";
rev = "v${version}";
sha256 = "0sy9gmjcvmwciamqvd7kd9qw2wd7ksklk80815fsn7sj0wiqxjyd";
rev = "${version}";
sha256 = "07cm8zba8n0ihzdm3k4a4rsg5v62xxsfvcw4h0niz91c0parqjqy";
};

patches = [
(fetchpatch {
name = "gast-0.3.patch";
url = "https://github.com/tensorflow/probability/commit/ae7a9d9771771ec1e7755a3588b9325f050a84cc.patch";
sha256 = "0kfhx30gshm8f3945na9yjjik71r20qmjzifbigaj4l8dwd9dz1a";
excludes = ["testing/*"];
})
(fetchpatch {
name = "cloudpickle-1.2.patch";
url = "https://github.com/tensorflow/probability/commit/78ef12b5afe3f567d16c70b74015ed1ddff1b0c8.patch";
sha256 = "12ms2xcljvvrnig0j78s3wfv4yf3bm5ps4rgfgv5lg2a8mzpc1ga";
})
];

nativeBuildInputs = [
# needed to create the output wheel in installPhase
python
setuptools
wheel
absl-py
tensorflow
];

bazelTarget = ":pip_pkg";

fetchAttrs = {
sha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5";
sha256 = "0135nxxvkmjzpd80r1g9fdkk9h62g0xlvp32g5zgk0hkma5kq0bx";
};

buildAttrs = {
@@ -75,6 +94,7 @@ in buildPythonPackage {
numpy
decorator
cloudpickle
gast
];

# Listed here: