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: 284c3edbc80d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c4f8216cf2cb
Choose a head ref
  • 8 commits
  • 8 files changed
  • 2 contributors

Commits on Nov 26, 2018

  1. pythonPackages.affine: init at 2.2.1

    Massimo Redaelli authored and Massimo Redaelli committed Nov 26, 2018

    Unverified

    No user is associated with the committer email.
    Copy the full SHA
    962bc25 View commit details
  2. pythonPackages.pyepsg: init at 0.3.2

    Massimo Redaelli authored and Massimo Redaelli committed Nov 26, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    d9d8bcb View commit details
  3. pythonPackages.gentools: init at 1.1.0

    Massimo Redaelli authored and Massimo Redaelli committed Nov 26, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    7fbc7ac View commit details
  4. pythonPackages.snug: init at 1.3.4

    Massimo Redaelli authored and Massimo Redaelli committed Nov 26, 2018
    Copy the full SHA
    440f19a View commit details
  5. pythonPackages.snuggs: init at 1.4.2

    Massimo Redaelli authored and Massimo Redaelli committed Nov 26, 2018
    Copy the full SHA
    443b5e8 View commit details
  6. pythonPackages.cartopy: init at 0.17.0

    Massimo Redaelli authored and Massimo Redaelli committed Nov 26, 2018
    Copy the full SHA
    39d1108 View commit details
  7. pythonPackages.rasterio: init at 1.0.10

    Massimo Redaelli authored and Massimo Redaelli committed Nov 26, 2018
    Copy the full SHA
    46aedca View commit details
  8. Merge pull request #50951 from mredaelli/geopystuff

    pythonPackages.affine: init at 2.2.1
    dotlambda authored Nov 26, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    c4f8216 View commit details
22 changes: 22 additions & 0 deletions pkgs/development/python-modules/affine/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{ buildPythonPackage, pytest, lib, fetchPypi }:

buildPythonPackage rec {
pname = "affine";
version = "2.2.1";

src = fetchPypi {
inherit pname version;
sha256 = "0j3mvcnmgjvvm0znqyf7xylq7i89zjf4dq0g8280xs6bwbl5cvih";
};

checkInputs = [ pytest ];
checkPhase = "py.test";

meta = with lib; {
description = "Matrices describing affine transformation of the plane";
license = licenses.bsd3;
homepage = https://github.com/sgillies/affine;
maintainers = with maintainers; [ mredaelli ];
};

}
46 changes: 46 additions & 0 deletions pkgs/development/python-modules/cartopy/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{ buildPythonPackage, lib, fetchPypi
, pytest, filelock, mock, pep8
, cython, isPy37, glibcLocales
, six, pyshp, shapely, geos, proj, numpy
, gdal, pillow, matplotlib, pyepsg, pykdtree, scipy, owslib, fiona
}:

buildPythonPackage rec {
pname = "cartopy";
version = "0.17.0";

src = fetchPypi {
inherit version;
pname = "Cartopy";
sha256 = "0q9ckfi37cxj7jwnqnzij62vwcf4krccx576vv5lhvpgvplxjjs2";
};

checkInputs = [ filelock mock pytest pep8 ];

# several tests require network connectivity: we disable them
checkPhase = ''
export HOME=$(mktemp -d)
pytest --pyargs cartopy \
-m "not network and not natural_earth" \
-k "not test_nightshade_image"
'';

buildInputs = [ cython glibcLocales ];
LC_ALL = "en_US.UTF-8";

propagatedBuildInputs = [
# required
six pyshp shapely geos proj numpy

# optional
gdal pillow matplotlib pyepsg pykdtree scipy fiona owslib
];

meta = with lib; {
description = "Process geospatial data to create maps and perform analyses";
license = licenses.lgpl3;
homepage = https://scitools.org.uk/cartopy/docs/latest/;
maintainers = with maintainers; [ mredaelli ];
};

}
31 changes: 31 additions & 0 deletions pkgs/development/python-modules/gentools/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{ buildPythonPackage, lib, fetchFromGitHub, pytest
, typing, funcsigs, pythonOlder
}:

buildPythonPackage rec {
pname = "gentools";
version = "1.1.0";

# Pypi doesn't ship the tests, so we fetch directly from GitHub
src = fetchFromGitHub {
owner = "ariebovenberg";
repo = pname;
rev = "v${version}";
sha256 = "1sm6cqi7fv2k3pc68r7wvvjjz8y6cjmz8bvxgqfa4v4wxibwnwrl";
};

propagatedBuildInputs =
lib.optionals (pythonOlder "3.5") [ typing ] ++
lib.optionals (pythonOlder "3.4") [ funcsigs ];

checkInputs = [ pytest ];
checkPhase = "pytest";

meta = with lib; {
description = "Tools for generators, generator functions, and generator-based coroutines";
license = licenses.mit;
homepage = http://gentools.readthedocs.io/;
maintainers = with maintainers; [ mredaelli ];
};

}
23 changes: 23 additions & 0 deletions pkgs/development/python-modules/pyepsg/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{ buildPythonPackage, lib, fetchPypi, requests }:

buildPythonPackage rec {
pname = "pyepsg";
version = "0.3.2";

src = fetchPypi {
inherit pname version;
sha256 = "0ng0k140kzq3xcffi4vy10py4cmwzfy8anccysw3vgn1x30ghzjr";
};

propagatedBuildInputs = [ requests ];

doCheck = false;

meta = with lib; {
description = "Simple Python interface to epsg.io";
license = licenses.lgpl3;
homepage = https://pyepsg.readthedocs.io/en/latest/;
maintainers = with maintainers; [ mredaelli ];
};

}
29 changes: 29 additions & 0 deletions pkgs/development/python-modules/rasterio/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{ buildPythonPackage, lib, fetchFromGitHub
, cython
, numpy, affine, attrs, cligj, click-plugins, snuggs, gdal
, pytest, pytestcov, packaging, hypothesis, boto3
}:

buildPythonPackage rec {
pname = "rasterio";
version = "1.0.10";

# Pypi doesn't ship the tests, so we fetch directly from GitHub
src = fetchFromGitHub {
owner = "mapbox";
repo = "rasterio";
rev = version;
sha256 = "0gnck9y3n31nnazlrw54swab8wql9qjx5r5x9r7hrmzy72xlzjqq";
};

checkInputs = [ boto3 pytest pytestcov packaging hypothesis ];
buildInputs = [ cython ];
propagatedBuildInputs = [ gdal numpy attrs affine cligj click-plugins snuggs ];

meta = with lib; {
description = "Python package to read and write geospatial raster data";
license = licenses.bsd3;
homepage = https://rasterio.readthedocs.io/en/latest/;
maintainers = with maintainers; [ mredaelli ];
};
}
37 changes: 37 additions & 0 deletions pkgs/development/python-modules/snug/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{ buildPythonPackage, lib, fetchFromGitHub, glibcLocales
, pytest, pytest-mock, gentools
, typing, singledispatch, pythonOlder
}:

buildPythonPackage rec {
pname = "snug";
version = "1.3.4";

# Pypi doesn't ship the tests, so we fetch directly from GitHub
src = fetchFromGitHub {
owner = "ariebovenberg";
repo = "snug";
rev = "v${version}";
sha256 = "0jmg0sivz9ljazlnsrrqaizrb3r7asy5pa0dj3idx49gbig4589i";
};

# Prevent unicode decoding error in setup.py
# while reading README.rst and HISTORY.rst
buildInputs = [ glibcLocales ];
LC_ALL = "en_US.UTF-8";

propagatedBuildInputs =
lib.optionals (pythonOlder "3.4") [ singledispatch ] ++
lib.optionals (pythonOlder "3.5") [ typing ];

checkInputs = [ pytest pytest-mock gentools ];
checkPhase = "pytest";

meta = with lib; {
description = "Tiny toolkit for writing reusable interactions with web APIs";
license = licenses.mit;
homepage = https://snug.readthedocs.io/en/latest/;
maintainers = with maintainers; [ mredaelli ];
};

}
29 changes: 29 additions & 0 deletions pkgs/development/python-modules/snuggs/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{ buildPythonPackage, lib, fetchFromGitHub
, click, numpy, pyparsing
, pytest
}:

buildPythonPackage rec {
pname = "snuggs";
version = "1.4.2";

# Pypi doesn't ship the tests, so we fetch directly from GitHub
src = fetchFromGitHub {
owner = "mapbox";
repo = pname;
rev = version;
sha256 = "1q6jqwai4qgghdjgwhyx3yz8mlrm7p1vvnwc339lfl028hrgb5kb";
};

propagatedBuildInputs = [ click numpy pyparsing ];

checkInputs = [ pytest ];
checkPhase = "pytest test_snuggs.py";

meta = with lib; {
description = "S-expressions for Numpy";
license = licenses.mit;
homepage = https://github.com/mapbox/snuggs;
maintainers = with maintainers; [ mredaelli ];
};
}
14 changes: 14 additions & 0 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
@@ -744,6 +744,8 @@ in {

adal = callPackage ../development/python-modules/adal { };

affine = callPackage ../development/python-modules/affine { };

aioconsole = callPackage ../development/python-modules/aioconsole { };

aiodns = callPackage ../development/python-modules/aiodns { };
@@ -1053,6 +1055,8 @@ in {

pyechonest = callPackage ../development/python-modules/pyechonest { };

pyepsg = callPackage ../development/python-modules/pyepsg { };

pyezminc = callPackage ../development/python-modules/pyezminc { };

billiard = callPackage ../development/python-modules/billiard { };
@@ -1134,6 +1138,8 @@ in {

carrot = callPackage ../development/python-modules/carrot {};

cartopy = callPackage ../development/python-modules/cartopy {};

case = callPackage ../development/python-modules/case {};

cassandra-driver = callPackage ../development/python-modules/cassandra-driver { };
@@ -2415,6 +2421,8 @@ in {

genshi = callPackage ../development/python-modules/genshi { };

gentools = callPackage ../development/python-modules/gentools { };

gevent = callPackage ../development/python-modules/gevent { };

geventhttpclient = callPackage ../development/python-modules/geventhttpclient { };
@@ -3657,6 +3665,8 @@ in {

rabbitpy = callPackage ../development/python-modules/rabbitpy { };

rasterio = callPackage ../development/python-modules/rasterio { };

radicale_infcloud = callPackage ../development/python-modules/radicale_infcloud {};

recaptcha_client = callPackage ../development/python-modules/recaptcha_client { };
@@ -3841,6 +3851,10 @@ in {

snowballstemmer = callPackage ../development/python-modules/snowballstemmer { };

snug = callPackage ../development/python-modules/snug { };

snuggs = callPackage ../development/python-modules/snuggs { };

spake2 = callPackage ../development/python-modules/spake2 { };

sphfile = callPackage ../development/python-modules/sphfile { };