Merge master into staging
This commit is contained in:
Frederik Rietdijk
@@ -2,7 +2,6 @@
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy3k
|
||||
, python
|
||||
, glibcLocales
|
||||
, pkgconfig
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{lib, buildPythonPackage, fetchPypi, isPy3k, incremental, ipaddress, twisted
|
||||
, automat, zope_interface, idna, pyopenssl, service-identity, pytest, mock, lsof
|
||||
{lib, buildPythonPackage, fetchPypi
|
||||
, geoip, nose}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, isPy3k }:
|
||||
{ buildPythonPackage, fetchPypi, isPy3k }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "JPype1";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchPypi, buildPythonPackage, fetchFromGitHub, python, gnugrep }:
|
||||
{ stdenv, buildPythonPackage, fetchFromGitHub, python, gnugrep }:
|
||||
|
||||
let
|
||||
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
, isPy3k
|
||||
, nose
|
||||
, numpy
|
||||
, pydot_ng
|
||||
, scipy
|
||||
, six
|
||||
, libgpuarray
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi
|
||||
{ buildPythonPackage
|
||||
, certbot
|
||||
, nose
|
||||
, cryptography
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp }:
|
||||
{ lib, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohttp-jinja2";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder
|
||||
{ lib, buildPythonPackage, fetchPypi, pythonOlder
|
||||
, typing, aiohttp
|
||||
}:
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, buildPythonPackage, fetchPypi, aiohttp }:
|
||||
{ lib, buildPythonPackage, fetchPypi, aiohttp }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohue";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi, isPy3k, nose }:
|
||||
{ buildPythonPackage, fetchPypi, isPy3k, nose }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "anyjson";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPythonPackage, fetchdarcs, zope_interface, isPy3k }:
|
||||
{ buildPythonPackage, fetchdarcs, zope_interface, isPy3k }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-application";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi
|
||||
{ buildPythonPackage, fetchPypi
|
||||
, boto }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ buildPythonPackage, fetchPypi, lib,
|
||||
coverage, dicttoxml, flake8, pexpect, prettytable, requests_toolbelt
|
||||
dicttoxml, pexpect, prettytable, requests_toolbelt
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "argcomplete";
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, cffi
|
||||
{ cffi
|
||||
, six
|
||||
, hypothesis
|
||||
, pytest
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, buildPythonPackage, pytest, requests, requests_oauthlib, six
|
||||
{ buildPythonPackage, pytest, requests, requests_oauthlib, six
|
||||
, fetchFromGitHub, responses, stdenv
|
||||
}:
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, pytestrunner
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi, isPy33, pythonOlder }:
|
||||
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncio";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, fetchFromGitHub, pythonOlder, python }:
|
||||
{ lib, buildPythonPackage, fetchPypi, pythonOlder, python }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asynctest";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi, numpy, future, nose }:
|
||||
{ stdenv, buildPythonPackage, fetchPypi, numpy, future }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "autograd";
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchPypi
|
||||
, buildPythonApplication, isPy27, python, pythonOlder
|
||||
, buildPythonApplication, python, pythonOlder
|
||||
, mock, nose, pathpy, pyhamcrest, pytest
|
||||
, glibcLocales, parse, parse-type, six
|
||||
, traceback2
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, python, fetchPypi, fetchurl, makeWrapper, unzip }:
|
||||
{ stdenv, python, fetchPypi, makeWrapper, unzip }:
|
||||
|
||||
let
|
||||
wheel_source = fetchPypi {
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
{ buildPythonPackage
|
||||
, fetchPypi
|
||||
, nose
|
||||
, numpy
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, requests
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, isPy3k
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi, isPyPy }:
|
||||
{ stdenv, buildPythonPackage, fetchPypi }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cachetools";
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pyserial
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, python
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, nose
|
||||
, can
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, wget, buildPythonPackage, isPy3k }:
|
||||
{ stdenv, fetchurl, buildPythonPackage, isPy3k }:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPythonPackage, isPy27, isPyPy, fetchPypi, libffi, pycparser, pytest }:
|
||||
{ stdenv, buildPythonPackage, isPyPy, fetchPypi, libffi, pycparser, pytest }:
|
||||
|
||||
if isPyPy then null else buildPythonPackage rec {
|
||||
pname = "cffi";
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
{ buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytest
|
||||
, coveralls
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, python
|
||||
{ stdenv, lib
|
||||
, buildPythonPackage, fetchPypi, isPy3k
|
||||
, filelock, protobuf, numpy, pytest, mock
|
||||
, cupy, cudaSupport ? false
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
{ buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytest
|
||||
}:
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi
|
||||
{ buildPythonPackage, fetchPypi
|
||||
, iowait, psutil, pyzmq, tornado, mock }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchPypi, buildPythonPackage, pythonOlder, isPy3k
|
||||
, pyperclip, six, pyparsing, vim, wcwidth, colorama
|
||||
, contextlib2 ? null, subprocess32 ? null
|
||||
, pytest, mock, which, fetchFromGitHub, glibcLocales
|
||||
, contextlib2 ? null
|
||||
, pytest, mock, which, glibcLocales
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "cmd2";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchPypi, buildPythonPackage, pythonOlder
|
||||
{ stdenv, buildPythonPackage, pythonOlder
|
||||
, pyperclip, six, pyparsing, vim
|
||||
, contextlib2 ? null, subprocess32 ? null
|
||||
, pytest, mock, which, fetchFromGitHub, glibcLocales
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, buildPythonPackage, fetchPypi, requests-cache }:
|
||||
{ lib, buildPythonPackage, fetchPypi, requests-cache }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "coinmarketcap";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ buildPythonPackage, fetchPypi, python, stdenv, nose
|
||||
{ buildPythonPackage, fetchPypi, stdenv
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, buildPythonPackage, fetchPypi }:
|
||||
{ lib, buildPythonPackage, fetchPypi }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ConfigArgParse";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi, isPy3k }:
|
||||
{ stdenv, buildPythonPackage, fetchPypi }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "configparser";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPythonPackage, fetchFromGitHub, six, pytest, pythonOlder }:
|
||||
{ stdenv, buildPythonPackage, fetchFromGitHub, six, pytest }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "construct";
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy3k
|
||||
, mock
|
||||
}:
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{stdenv, lib, buildPythonPackage, fetchPypi, bash, which, writeText}:
|
||||
{stdenv, lib, buildPythonPackage, fetchPypi, bash, which}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.7";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, cryptography, boto3, pyyaml, docutils, nose }:
|
||||
{ stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, nose }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "credstash";
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
{ buildPythonPackage
|
||||
, fetchPypi
|
||||
, cryptography
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, python, buildPythonPackage
|
||||
{ stdenv, buildPythonPackage
|
||||
, fetchPypi, isPy3k, linuxPackages, gcc5
|
||||
, fastrlock, numpy, six, wheel, pytest, mock
|
||||
, cudatoolkit, cudnn, nccl
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy35, ncurses }:
|
||||
{ stdenv, buildPythonPackage, fetchPypi, ncurses }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cx_Freeze";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
|
||||
{ lib, buildPythonPackage, fetchFromGitHub
|
||||
, decorator, requests, simplejson
|
||||
, nose, mock }:
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, fetchPypi, buildPythonPackage, isPy3k
|
||||
{ lib, fetchPypi, buildPythonPackage
|
||||
, nose
|
||||
, parameterized
|
||||
, mock
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi, isPy3k, six }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-dateutil";
|
||||
version = "2.7.3";
|
||||
disabled = isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e27001de32f627c22380a688bcc43ce83504a7bc5da472209b4c70f02829f0b8";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Powerful extensions to the standard datetime module";
|
||||
homepage = https://pypi.python.org/pypi/python-dateutil;
|
||||
license = "BSD-style";
|
||||
};
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, fetchurl, buildPythonPackage, python, pkgconfig, dbus, dbus-glib, dbus_tools, isPyPy
|
||||
{ lib, fetchurl, buildPythonPackage, python, pkgconfig, dbus, dbus-glib, isPyPy
|
||||
, ncurses, pygobject3 }:
|
||||
|
||||
if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else buildPythonPackage rec {
|
||||
@@ -15,7 +15,7 @@ if isPyPy then throw "dbus-python not supported for interpreter ${python.executa
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ dbus dbus-glib ]
|
||||
++ lib.optionals doCheck [ dbus_tools pygobject3 ]
|
||||
++ lib.optionals doCheck [ dbus.out pygobject3 ]
|
||||
# My guess why it's sometimes trying to -lncurses.
|
||||
# It seems not to retain the dependency anyway.
|
||||
++ lib.optional (! python ? modules) ncurses;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi
|
||||
{ buildPythonPackage, fetchPypi
|
||||
, chardet, six}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi }:
|
||||
{ buildPythonPackage, fetchPypi }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "defusedxml";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi, django }:
|
||||
{ buildPythonPackage, fetchPypi, django }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-tagging";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchPypi, openssl, makeWrapper, buildPythonPackage
|
||||
{ stdenv, fetchPypi, openssl, buildPythonPackage
|
||||
, pytest, dnspython, pynacl, authres, python }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder }:
|
||||
{ buildPythonPackage, fetchPypi, pythonOlder }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dugong";
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchPypi, buildPythonPackage, isPy3k, hidapi
|
||||
, pycrypto, pillow, protobuf, future, ecpy
|
||||
, pycrypto, pillow, protobuf, future
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, dnspython, idna, ipaddress }:
|
||||
{ lib, buildPythonPackage, fetchPypi, isPy3k, dnspython, idna, ipaddress }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "email_validator";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchPypi, buildPythonPackage, fetchpatch }:
|
||||
{ stdenv, fetchPypi, buildPythonPackage }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "faulthandler";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi, fetchurl, dateutil, lxml }:
|
||||
{ stdenv, buildPythonPackage, fetchPypi, dateutil, lxml }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "feedgen";
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ lib, fetchFromGitHub, buildPythonPackage, python, flake8, six,
|
||||
fetchurl }:
|
||||
{ lib, fetchFromGitHub, buildPythonPackage, flake8, six }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flake8-future-import";
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi, isPy3k, python, glibcLocales, flask, flask_sqlalchemy, flask_script, alembic
|
||||
}:
|
||||
{ stdenv, buildPythonPackage, fetchPypi, isPy3k, glibcLocales, flask, flask_sqlalchemy, flask_script, alembic }:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchurl
|
||||
, isPy3k
|
||||
, docutils
|
||||
, requests
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, writeText, buildPythonPackage, fetchPypi }:
|
||||
{ lib, buildPythonPackage, fetchPypi }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fpdf";
|
||||
|
||||
@@ -4,8 +4,6 @@
|
||||
, html5lib
|
||||
, wcwidth
|
||||
, nose
|
||||
, python
|
||||
, isPy3k
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
||||
@@ -5,9 +5,6 @@
|
||||
, six
|
||||
, scipy
|
||||
, smart_open
|
||||
, scikitlearn
|
||||
, testfixtures
|
||||
, unittest2
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook,
|
||||
pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir,
|
||||
pkgconfig, boost, expat, scipy, cgal, gmp, mpfr,
|
||||
gobjectIntrospection, pygobject3, gtk3, matplotlib, ncurses,
|
||||
buildPythonPackage }:
|
||||
|
||||
|
||||
45
pkgs/development/python-modules/graphite-api/default.nix
Normal file
45
pkgs/development/python-modules/graphite-api/default.nix
Normal file
@@ -0,0 +1,45 @@
|
||||
{ buildPythonPackage, fetchFromGitHub, lib, flask, flask-caching, cairocffi, pyparsing, pytz, pyyaml
|
||||
, raven, six, structlog, tzlocal, nose, mock, cairo, isPyPy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "graphite-api";
|
||||
version = "1.1.3";
|
||||
|
||||
disabled = isPyPy;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brutasse";
|
||||
repo = "graphite-api";
|
||||
rev = version;
|
||||
sha256 = "0sz3kav2024ms2z4q03pigcf080gsr5v774z9bp3zw29k2p47ass";
|
||||
};
|
||||
|
||||
# https://github.com/brutasse/graphite-api/pull/239 rebased onto 1.1.3
|
||||
patches = [ ./flask-caching-rebased.patch ];
|
||||
|
||||
checkPhase = "nosetests";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
flask
|
||||
flask-caching
|
||||
cairocffi
|
||||
pyparsing
|
||||
pytz
|
||||
pyyaml
|
||||
raven
|
||||
six
|
||||
structlog
|
||||
tzlocal
|
||||
];
|
||||
|
||||
checkInputs = [ nose mock ];
|
||||
|
||||
LD_LIBRARY_PATH = "${cairo.out}/lib";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Graphite-web, without the interface. Just the rendering HTTP API";
|
||||
homepage = https://github.com/brutasse/graphite-api;
|
||||
license = licenses.asl20;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,132 @@
|
||||
diff --git a/graphite_api/config.py b/graphite_api/config.py
|
||||
index 5e1e382..dc033a8 100644
|
||||
--- a/graphite_api/config.py
|
||||
+++ b/graphite_api/config.py
|
||||
@@ -112,11 +112,11 @@ def configure(app):
|
||||
app.cache = None
|
||||
if 'cache' in config:
|
||||
try:
|
||||
- from flask.ext.cache import Cache
|
||||
+ from flask_caching import Cache
|
||||
except ImportError:
|
||||
warnings.warn("'cache' is provided in the configuration but "
|
||||
- "Flask-Cache is not installed. Please `pip install "
|
||||
- "Flask-Cache`.")
|
||||
+ "flask-caching is not installed. Please `pip "
|
||||
+ "install flask-caching`.")
|
||||
else:
|
||||
cache_conf = {'CACHE_DEFAULT_TIMEOUT': 60,
|
||||
'CACHE_KEY_PREFIX': 'graphite-api:'}
|
||||
diff --git a/requirements.txt b/requirements.txt
|
||||
index c68b446..7826b0c 100644
|
||||
--- a/requirements.txt
|
||||
+++ b/requirements.txt
|
||||
@@ -1,5 +1,5 @@
|
||||
Flask
|
||||
-Flask-Cache
|
||||
+Flask-Caching
|
||||
cairocffi
|
||||
pyparsing>=1.5.7
|
||||
pytz
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 0337cbe..df07989 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -38,7 +38,7 @@ setup(
|
||||
extras_require={
|
||||
'sentry': ['raven[flask]'],
|
||||
'cyanite': ['cyanite'],
|
||||
- 'cache': ['Flask-Cache'],
|
||||
+ 'cache': ['Flask-Caching'],
|
||||
'statsd': ['statsd'],
|
||||
},
|
||||
zip_safe=False,
|
||||
diff --git a/tests/test_render.py b/tests/test_render.py
|
||||
index be5609d..a0e7190 100644
|
||||
--- a/tests/test_render.py
|
||||
+++ b/tests/test_render.py
|
||||
@@ -8,7 +8,7 @@ from graphite_api._vendor import whisper
|
||||
from . import TestCase, WHISPER_DIR
|
||||
|
||||
try:
|
||||
- from flask.ext.cache import Cache
|
||||
+ from flask_caching import Cache
|
||||
except ImportError:
|
||||
Cache = None
|
||||
|
||||
diff --git a/tox.ini b/tox.ini
|
||||
index 85a0abb..c820393 100644
|
||||
--- a/tox.ini
|
||||
+++ b/tox.ini
|
||||
@@ -47,7 +47,7 @@ basepython = python2.7
|
||||
deps =
|
||||
{[testenv]deps}
|
||||
Flask
|
||||
- Flask-Cache
|
||||
+ Flask-Caching
|
||||
pyparsing
|
||||
mock
|
||||
|
||||
@@ -56,7 +56,7 @@ basepython = python3.3
|
||||
deps =
|
||||
{[testenv]deps}
|
||||
Flask
|
||||
- Flask-Cache
|
||||
+ Flask-Caching
|
||||
pyparsing
|
||||
|
||||
[testenv:py34]
|
||||
@@ -66,7 +66,7 @@ commands =
|
||||
deps =
|
||||
{[testenv]deps}
|
||||
Flask
|
||||
- Flask-Cache
|
||||
+ Flask-Caching
|
||||
pyparsing
|
||||
|
||||
[testenv:py35]
|
||||
@@ -76,7 +76,7 @@ commands =
|
||||
deps =
|
||||
{[testenv]deps}
|
||||
Flask
|
||||
- Flask-Cache
|
||||
+ Flask-Caching
|
||||
pyparsing
|
||||
|
||||
[testenv:pyparsing1]
|
||||
@@ -84,7 +84,7 @@ basepython = python2.7
|
||||
deps =
|
||||
{[testenv]deps}
|
||||
Flask
|
||||
- Flask-Cache
|
||||
+ Flask-Caching
|
||||
pyparsing==1.5.7
|
||||
mock
|
||||
|
||||
@@ -93,7 +93,7 @@ basepython = pypy
|
||||
deps =
|
||||
{[testenv]deps}
|
||||
Flask
|
||||
- Flask-Cache
|
||||
+ Flask-Caching
|
||||
pyparsing
|
||||
mock
|
||||
|
||||
@@ -102,7 +102,7 @@ basepython = python2.7
|
||||
deps =
|
||||
{[testenv]deps}
|
||||
Flask<0.9
|
||||
- Flask-Cache
|
||||
+ Flask-Caching
|
||||
pyparsing
|
||||
mock
|
||||
|
||||
@@ -111,7 +111,7 @@ basepython = python2.7
|
||||
deps =
|
||||
{[testenv]deps}
|
||||
Flask<0.10
|
||||
- Flask-Cache
|
||||
+ Flask-Caching
|
||||
pyparsing
|
||||
mock
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
{ fetchurl, python }:
|
||||
assert python.pkgs.isPy27;
|
||||
let utf =
|
||||
if python.ucsEncoding == 2 then "16"
|
||||
else if python.ucsEncoding == 4 then "32"
|
||||
else throw "Unsupported python UCS encoding UCS${toString python.ucsEncoding}";
|
||||
in python.pkgs.buildPythonPackage
|
||||
|
||||
python.pkgs.buildPythonPackage
|
||||
{ pname = "gurobipy";
|
||||
version = "7.5.2";
|
||||
src = fetchurl
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchPypi, fetchpatch, isPy27, python, buildPythonPackage
|
||||
{ stdenv, fetchPypi, isPy27, python, buildPythonPackage
|
||||
, numpy, hdf5, cython, six, pkgconfig, unittest2
|
||||
, mpi4py ? null, openssh }:
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi, python
|
||||
{ stdenv, buildPythonPackage, fetchPypi
|
||||
, pytest, pytestcov, watchdog, mock
|
||||
}:
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi
|
||||
{ buildPythonPackage, fetchPypi
|
||||
, requests, six, dateutil }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, python
|
||||
{ lib, buildPythonPackage, fetchFromGitHub
|
||||
, isPy3k, attrs, coverage, enum34
|
||||
, doCheck ? true, pytest, pytest_xdist, flake8, flaky, mock
|
||||
, doCheck ? true, pytest, pytest_xdist, flaky, mock
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
# http://hypothesis.readthedocs.org/en/latest/packaging.html
|
||||
|
||||
34
pkgs/development/python-modules/image-match/default.nix
Normal file
34
pkgs/development/python-modules/image-match/default.nix
Normal file
@@ -0,0 +1,34 @@
|
||||
{ stdenv, buildPythonPackage, fetchFromGitHub, pytestrunner, scikitimage }:
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "image-match";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ascribe";
|
||||
repo = "image-match";
|
||||
rev = "1c5f3170555540bdf43ff8b8189c4e8c13a8b950";
|
||||
sha256 = "0vlmpidmhkpgdzw2k03x5layhijcrjpmyfd93yv2ls77ihz00ix5";
|
||||
};
|
||||
|
||||
buildInputs = [ pytestrunner ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
scikitimage
|
||||
];
|
||||
|
||||
# remove elasticsearch requirement due to version incompatibility
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace "'elasticsearch>=5.0.0,<6.0.0'," ""
|
||||
'';
|
||||
|
||||
# tests cannot work without elasticsearch
|
||||
doCheck = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/ascribe/image-match;
|
||||
description = "Quickly search over billions of images";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ cmcdragonkai ];
|
||||
};
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi }:
|
||||
{ buildPythonPackage, fetchPypi }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "iowait";
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
# Build dependencies
|
||||
, glibcLocales
|
||||
# Test dependencies
|
||||
@@ -13,7 +12,6 @@
|
||||
, mock
|
||||
# Runtime dependencies
|
||||
, backports_shutil_get_terminal_size
|
||||
, jedi
|
||||
, decorator
|
||||
, pathlib2
|
||||
, pickleshare
|
||||
|
||||
@@ -1,11 +1,8 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, nose
|
||||
, sphinx
|
||||
, numpydoc
|
||||
, isPy3k
|
||||
, stdenv
|
||||
, pytest
|
||||
}:
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, buildPythonPackage, fetchPypi }:
|
||||
{ lib, buildPythonPackage, fetchPypi }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jsmin";
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, python
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, ipython
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, python
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchzip
|
||||
@@ -13,7 +12,6 @@
|
||||
, traitlets
|
||||
, requests
|
||||
, pythonOlder
|
||||
, nodejs-8_x
|
||||
, nodePackages
|
||||
}:
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, kaitaistruct, buildPythonPackage, fetchPypi }:
|
||||
{ stdenv, buildPythonPackage, fetchPypi }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "kaitaistruct";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, buildPythonPackage, fetchPypi
|
||||
{ stdenv, buildPythonPackage, fetchPypi
|
||||
, pytest, pytestcov, pytestpep8, pytest_xdist
|
||||
, six, numpy, scipy, pyyaml, h5py
|
||||
}:
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, buildPythonPackage, fetchPypi
|
||||
{ buildPythonPackage, fetchPypi
|
||||
, pyasn1, pyasn1-modules, pytest
|
||||
, openldap, cyrus_sasl }:
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, isPy3k
|
||||
{ lib, buildPythonPackage, fetchPypi
|
||||
, pbr, ldap, fixtures, testresources, testtools }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ stdenv, lib, buildPythonPackage, fetchFromGitHub
|
||||
, python, cmake, sip, protobuf, pythonOlder }:
|
||||
{ stdenv, buildPythonPackage, fetchFromGitHub
|
||||
, cmake, sip, protobuf, pythonOlder }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libarcus";
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
, six
|
||||
, nose
|
||||
, Mako
|
||||
, python
|
||||
, cudaSupport ? false, cudatoolkit , nvidia_x11
|
||||
, openclSupport ? true, ocl-icd, clblas
|
||||
}:
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi, python, pkgconfig, libversion, pythonOlder }:
|
||||
{ stdenv, buildPythonPackage, fetchPypi, pkgconfig, libversion, pythonOlder }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libversion";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPythonPackage, fetchgit, python, pkgconfig, lxml, libvirt, nose }:
|
||||
{ stdenv, buildPythonPackage, fetchgit, pkgconfig, lxml, libvirt, nose }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libvirt";
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{ stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
isPy3k,
|
||||
pythonOlder,
|
||||
lib,
|
||||
requests,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi, fetchFromGitHub }:
|
||||
{ stdenv, buildPythonPackage, fetchPypi }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lmtpd";
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy3k
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy3k
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy3k
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, mozfile
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, moznetwork
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, moznetwork
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy3k
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, mozlog
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user