Merge pull request #108663 from fabaff/geopy

authored by

Sandro and committed by
GitHub
6212342f 403ea9f2

+27 -15
+26 -14
pkgs/development/python-modules/geopy/default.nix
··· 1 - { lib, stdenv 1 + { lib 2 + , async_generator 2 3 , buildPythonPackage 3 4 , fetchFromGitHub 4 - , isPy3k 5 5 , geographiclib 6 + , isPy3k 7 + , pytestCheckHook 6 8 }: 7 9 8 10 buildPythonPackage rec { 9 - pname = "geopy-unstable"; 10 - version = "2019-11-10"; 11 - 11 + pname = "geopy"; 12 + version = "2.1.0"; 12 13 disabled = !isPy3k; # only Python 3 13 - doCheck = false; # Needs network access 14 - 15 - propagatedBuildInputs = [ geographiclib ]; 16 14 17 15 src = fetchFromGitHub { 18 - owner = "geopy"; 19 - repo = "geopy"; 20 - rev = "531b7de6126838a3e69370227aa7f2086ba52b89"; 21 - sha256 = "07l1pblzg3hb3dbvd9rq8x78ly5dv0zxbc5hwskqil0bhv5v1p39"; 16 + owner = pname; 17 + repo = pname; 18 + rev = version; 19 + sha256 = "0239a4achk49ngagb6aqy6cgzfwgbxir07vwi13ysbpx78y0l4g9"; 22 20 }; 23 21 22 + propagatedBuildInputs = [ geographiclib ]; 23 + 24 + checkInputs = [ 25 + async_generator 26 + pytestCheckHook 27 + ]; 28 + 29 + # Exclude tests which perform API calls 30 + pytestFlagsArray = [ "--ignore test/geocoders/" ]; 31 + pythonImportsCheck = [ "geopy" ]; 32 + 33 + __darwinAllowLocalNetworking = true; 34 + 24 35 meta = with lib; { 25 36 homepage = "https://github.com/geopy/geopy"; 26 37 description = "Python Geocoding Toolbox"; 27 - license = licenses.mit; 28 - maintainers = with maintainers; [GuillaumeDesforges]; 38 + changelog = "https://github.com/geopy/geopy/releases/tag/${version}"; 39 + license = with licenses; [ mit ]; 40 + maintainers = with maintainers; [ GuillaumeDesforges ]; 29 41 }; 30 42 }
+1 -1
pkgs/servers/home-assistant/component-packages.nix
··· 39 39 "apns" = ps: with ps; [ ]; # missing inputs: apns2 40 40 "apple_tv" = ps: with ps; [ aiohttp-cors netdisco pyatv zeroconf ]; 41 41 "apprise" = ps: with ps; [ apprise ]; 42 - "aprs" = ps: with ps; [ ]; # missing inputs: aprslib geopy 42 + "aprs" = ps: with ps; [ geopy ]; # missing inputs: aprslib 43 43 "aqualogic" = ps: with ps; [ ]; # missing inputs: aqualogic 44 44 "aquostv" = ps: with ps; [ ]; # missing inputs: sharp_aquos_rc 45 45 "arcam_fmj" = ps: with ps; [ ]; # missing inputs: arcam-fmj