Merge pull request #17332 from lancelotsix/update_sqlalchemy

Update sqlalchemy and related
This commit is contained in:
Frederik Rietdijk 2016-07-28 16:47:35 +02:00 committed by GitHub
commit 9a9294d0c6
1 changed files with 10 additions and 8 deletions

View File

@ -20241,11 +20241,11 @@ in modules // {
geoalchemy2 = buildPythonPackage rec {
name = "GeoAlchemy2-${version}";
version = "0.3.0.dev1";
version = "0.3.0";
src = pkgs.fetchurl {
url = "mirror://pypi/G/GeoAlchemy2/${name}.tar.gz";
sha256 = "1j95p860ikpcpcirs5791yjpy8rf18zsz7vvsdy6v3x32hkim0k6";
sha256 = "0p2h1kgl5b0jz8wadx485vjh1mmm5s67p71yxh9lhp1441hkfswf";
};
propagatedBuildInputs = with self ; [ sqlalchemy shapely ];
@ -21353,14 +21353,14 @@ in modules // {
shapely = buildPythonPackage rec {
name = "Shapely-${version}";
version = "1.5.13";
version = "1.5.15";
src = pkgs.fetchurl {
url = "mirror://pypi/S/Shapely/${name}.tar.gz";
sha256 = "68f8efb43112e8ef1f7e56e2c9eef64e0cbc1c19528c627696fb07345075a348";
sha256 = "0lfqxb3kpdn0g9zzlhzg79yc8iyy4fpsk0p5nd80gar1mmhr8pg7";
};
buildInputs = with self; [ pkgs.geos pkgs.glibcLocales pytest ];
buildInputs = with self; [ pkgs.geos pkgs.glibcLocales pytest cython ];
propagatedBuildInputs = with self; [ numpy ];
@ -21372,8 +21372,10 @@ in modules // {
sed -i "s|_lgeos = load_dll('geos_c', fallbacks=.*)|_lgeos = load_dll('geos_c', fallbacks=['${pkgs.geos}/lib/libgeos_c.so'])|" shapely/geos.py
'';
# tests/test_voctorized fails because the vectorized extension is not
# available in when running tests
checkPhase = ''
py.test $out
py.test --ignore tests/test_vectorized.py
'';
meta = {
@ -22307,11 +22309,11 @@ in modules // {
sqlalchemy_1_0 = buildPythonPackage rec {
name = "SQLAlchemy-${version}";
version = "1.0.12";
version = "1.0.14";
src = pkgs.fetchurl {
url = "mirror://pypi/S/SQLAlchemy/${name}.tar.gz";
sha256 = "1l8qclhd0s90w3pvwhi5mjxdwr5j7gw7cjka2fx6f2vqmq7f4yb6";
sha256 = "1cq52yyplvi1wrvrzn779l9sfsjb158a18xaqbn7z779q4wilkfs";
};
buildInputs = with self; [ nose mock ]