Merge commit 'e19054ab3cd5b7cc9a01d0efc71c8fe310541065'

1 files changed, 11 insertions, 12 deletions

diff --git a/nixpkgs/pkgs/development/python-modules/pvlib/default.nix b/nixpkgs/pkgs/development/python-modules/pvlib/default.nix
index 91af07b49be3..cdd6011aba2e 100644
--- a/nixpkgs/pkgs/development/python-modules/pvlib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pvlib/default.nix
@@ -1,27 +1,26 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, numpy, pandas, pytz, six
-, pytest, mock, pytest-mock }:
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, numpy, pandas, pytz, six
+, pytest, mock, pytest-mock, requests }:
 
 buildPythonPackage rec {
   pname = "pvlib";
-  version = "0.6.1";
+  version = "0.6.3";
 
-  # Use GitHub because PyPI release tarball doesn't contain the tests. See:
-  # https://github.com/pvlib/pvlib-python/issues/473
-  src = fetchFromGitHub{
-    owner = "pvlib";
-    repo = "pvlib-python";
-    rev = "v${version}";
-    sha256 = "17h7vz9s829qxnl4byr8458gzgiismrbrn5gl0klhfhwvc5kkdfh";
+  # Support for Python <3.5 dropped in 0.6.3 on June 1, 2019.
+  disabled = pythonOlder "3.5";
+
+  src = fetchPypi{
+    inherit pname version;
+    sha256 = "03nvgpmnscd7rh9jwm2h579zvriq5lva6rsdhb6jckpra5wjkn69";
   };
 
   checkInputs = [ pytest mock pytest-mock ];
-  propagatedBuildInputs = [ numpy pandas pytz six ];
+  propagatedBuildInputs = [ numpy pandas pytz six requests ];
 
   # Skip a few tests that try to access some URLs
   checkPhase = ''
     runHook preCheck
     pushd pvlib/test
-    pytest . -k "not test_read_srml_dt_index and not test_read_srml_month_from_solardata"
+    pytest . -k "not test_read_srml_dt_index and not test_read_srml_month_from_solardata and not test_get_psm3"
     popd
     runHook postCheck
   '';