Merge pull request #46823 from dywedir/pgcli

pgcli: 1.6.0 -> 1.10.3, pythonPackages.pgspecial: 1.8.0 -> 1.11.2
This commit is contained in:
Jörg Thalheim 2018-09-18 13:19:44 +01:00 committed by GitHub
commit 06a45d6b33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 36 deletions

View File

@ -0,0 +1,25 @@
{ stdenv, buildPythonPackage, fetchPypi, pytest, psycopg2, click, sqlparse }:
buildPythonPackage rec {
pname = "pgspecial";
version = "1.11.2";
src = fetchPypi {
inherit pname version;
sha256 = "1yq3cmpdcvwsz3nifc0db125433vxbgbpmbhxfj46b9s5k81xs30";
};
buildInputs = [ pytest psycopg2 ];
propagatedBuildInputs = [ click sqlparse ];
checkPhase = ''
find tests -name \*.pyc -delete
py.test tests
'';
meta = with stdenv.lib; {
description = "Meta-commands handler for Postgres Database";
homepage = https://pypi.python.org/pypi/pgspecial;
license = licenses.bsd3;
};
}

View File

@ -2,13 +2,13 @@
pythonPackages.buildPythonApplication rec {
name = "pgcli-${version}";
version = "1.6.0";
version = "1.10.3";
src = fetchFromGitHub {
sha256 = "0f1zv4kwi2991pclf8chrhgjwf8jkqxdh5ndc9qx6igh56iyyncz";
rev = "v${version}";
repo = "pgcli";
owner = "dbcli";
repo = "pgcli";
rev = "v${version}";
sha256 = "1qcbv2w036l0gc0li3jpa6amxzqmhv8d1q6wv4pfh0wvl17hqv9r";
};
buildInputs = with pythonPackages; [ pytest mock ];
@ -18,15 +18,10 @@ pythonPackages.buildPythonApplication rec {
'';
propagatedBuildInputs = with pythonPackages; [
click configobj humanize prompt_toolkit psycopg2
pygments sqlparse pgspecial setproctitle
cli-helpers click configobj humanize prompt_toolkit psycopg2
pygments sqlparse pgspecial setproctitle keyring
];
postPatch = ''
substituteInPlace setup.py --replace "==" ">="
rm tests/test_rowlimit.py
'';
meta = with lib; {
description = "Command-line interface for PostgreSQL";
longDescription = ''
@ -35,5 +30,6 @@ pythonPackages.buildPythonApplication rec {
'';
homepage = https://pgcli.com;
license = licenses.bsd3;
maintainers = with maintainers; [ dywedir ];
};
}

View File

@ -9458,31 +9458,7 @@ in {
};
};
pgspecial = buildPythonPackage rec {
pname = "pgspecial";
version = "1.8.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "1dwlv3m4jl34zsakmvxg6hgbfv786jl8dcffxsrlnmcpks829xc9";
};
buildInputs = with self; [ pytest psycopg2 ];
checkPhase = ''
find tests -name \*.pyc -delete
py.test tests
'';
propagatedBuildInputs = with self; [ click sqlparse ];
meta = {
description = "Meta-commands handler for Postgres Database";
homepage = https://pypi.python.org/pypi/pgspecial;
license = licenses.bsd3;
};
};
pgspecial = callPackage ../development/python-modules/pgspecial { };
pickleshare = buildPythonPackage rec {
version = "0.7.4";