Merge staging-next into staging
This commit is contained in:
Frederik Rietdijk
@@ -4,14 +4,14 @@
|
||||
, pytest, requests }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "2.1.3";
|
||||
version = "2.2.0";
|
||||
pname = "beancount";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4b7b0d3633c82ca88d3cb3d31ad2fd2e45a42401cfa94eaa1cb938ffece34f22";
|
||||
sha256 = "1j3fyyqnr5gq71rmkb9q3im8pqppa134zzhmmp4hk4b274g18w31";
|
||||
};
|
||||
|
||||
# No tests in archive
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cfgv";
|
||||
version = "1.1.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1akm5xdbi5kckgnhhfj6qavjwakm44cwqzhfx2ycgh7mkym1qyfi";
|
||||
sha256 = "01mpw8kx0f2py2jwf0fv60k01p11gs0dbar5zq42k4z38xf0bn9r";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six ];
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchPypi, buildPythonPackage, pythonOlder, isPy3k
|
||||
, pyperclip, six, pyparsing, vim, wcwidth, colorama
|
||||
, pyperclip, six, pyparsing, vim, wcwidth, colorama, attrs
|
||||
, contextlib2 ? null, typing ? null, setuptools_scm
|
||||
, pytest, mock ? null, pytest-mock
|
||||
, which, glibcLocales
|
||||
@@ -36,6 +36,7 @@ buildPythonPackage rec {
|
||||
six
|
||||
pyparsing
|
||||
wcwidth
|
||||
attrs
|
||||
]
|
||||
++ stdenv.lib.optionals (pythonOlder "3.5") [contextlib2 typing]
|
||||
;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ buildPythonPackage, fetchPypi
|
||||
{ buildPythonPackage, fetchPypi, isPy3k
|
||||
, six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools
|
||||
, setuptools_scm }:
|
||||
|
||||
@@ -6,6 +6,8 @@ buildPythonPackage rec {
|
||||
pname = "irc";
|
||||
version = "17.0";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f9c5fcb72dd230e1387fd4a0114a1935605e0f59ac09dec962313baed74e1365";
|
||||
|
||||
@@ -1,14 +1,26 @@
|
||||
{ buildPythonPackage, fetchPypi, setuptools_scm
|
||||
, inflect, more-itertools, six }:
|
||||
{ lib, buildPythonPackage, fetchPypi, setuptools_scm
|
||||
, inflect, more-itertools, six, pytest, pytest-flake8 }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jaraco.itertools";
|
||||
version = "3.0.0";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "19d8557a25c08f7a7b8f1cfa456ebfd615bafa0f045f89bbda55f99661b0626d";
|
||||
sha256 = "1d09zpi593bhr56rwm41kzffr18wif98plgy6xdy0zrbdwfarrxl";
|
||||
};
|
||||
doCheck = false;
|
||||
|
||||
buildInputs = [ setuptools_scm ];
|
||||
propagatedBuildInputs = [ inflect more-itertools six ];
|
||||
checkInputs = [ pytest pytest-flake8 ];
|
||||
|
||||
checkPhase = ''
|
||||
pytest
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tools for working with iterables";
|
||||
homepage = https://github.com/jaraco/jaraco.itertools;
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,14 +1,26 @@
|
||||
{ buildPythonPackage, fetchPypi, setuptools_scm
|
||||
, tempora, six }:
|
||||
{ lib, buildPythonPackage, fetchPypi, setuptools_scm
|
||||
, tempora, six, pytest, pytest-flake8 }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jaraco.logging";
|
||||
version = "1.5.2";
|
||||
version = "2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "199pgwx9ziab3gxg6p0c24z8dp3bjpsvvshnmlph9zjsssq0xc93";
|
||||
sha256 = "1lb846j7qs1hgqwkyifv51nhl3f8jimbc4lk8yn9nkaynw0vyzcg";
|
||||
};
|
||||
doCheck = false;
|
||||
|
||||
buildInputs = [ setuptools_scm ];
|
||||
propagatedBuildInputs = [ tempora six ];
|
||||
checkInputs = [ pytest pytest-flake8 ];
|
||||
|
||||
checkPhase = ''
|
||||
PYTHONPATH=".:$PYTHONPATH" pytest
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Support for Python logging facility";
|
||||
homepage = https://github.com/jaraco/jaraco.logging;
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
{ buildPythonPackage, fetchPypi, lib, cython, jq }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jq";
|
||||
version = "0.1.6";
|
||||
|
||||
srcs = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "34bdf9f9e49e522e1790afc03f3584c6b57329215ea0567fb2157867d6d6f602";
|
||||
};
|
||||
patches = [ ./jq-py-setup.patch ];
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
|
||||
preBuild = ''
|
||||
cython jq.pyx
|
||||
'';
|
||||
|
||||
buildInputs = [ jq ];
|
||||
|
||||
meta = {
|
||||
description = "Python bindings for jq, the flexible JSON processor";
|
||||
homepage = "https://github.com/mwilliamson/jq.py";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [ benley ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,130 @@
|
||||
From 3f369cf8b9f7134d0792f6b141d39b5342a8274f Mon Sep 17 00:00:00 2001
|
||||
From: Benjamin Staffin <benley@gmail.com>
|
||||
Date: Mon, 14 Jan 2019 17:27:06 -0500
|
||||
Subject: [PATCH] Vastly simplify setup.py for distro compatibility
|
||||
|
||||
---
|
||||
setup.py | 81 +-------------------------------------------------------
|
||||
1 file changed, 1 insertion(+), 80 deletions(-)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 77933f2..2b71e25 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -1,10 +1,6 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
import os
|
||||
-import platform
|
||||
-import subprocess
|
||||
-import tarfile
|
||||
-import shutil
|
||||
|
||||
try:
|
||||
import sysconfig
|
||||
@@ -14,88 +10,15 @@ except ImportError:
|
||||
|
||||
from setuptools import setup
|
||||
from distutils.extension import Extension
|
||||
-from distutils.command.build_ext import build_ext
|
||||
-
|
||||
-try:
|
||||
- from urllib import urlretrieve
|
||||
-except ImportError:
|
||||
- from urllib.request import urlretrieve
|
||||
-
|
||||
-def path_in_dir(relative_path):
|
||||
- return os.path.abspath(os.path.join(os.path.dirname(__file__), relative_path))
|
||||
|
||||
def read(fname):
|
||||
return open(os.path.join(os.path.dirname(__file__), fname)).read()
|
||||
|
||||
|
||||
-jq_lib_tarball_path = path_in_dir("_jq-lib-1.5.tar.gz")
|
||||
-jq_lib_dir = path_in_dir("jq-jq-1.5")
|
||||
-
|
||||
-oniguruma_lib_tarball_path = path_in_dir("_onig-5.9.6.tar.gz")
|
||||
-oniguruma_lib_build_dir = path_in_dir("onig-5.9.6")
|
||||
-oniguruma_lib_install_dir = path_in_dir("onig-install-5.9.6")
|
||||
-
|
||||
-class jq_build_ext(build_ext):
|
||||
- def run(self):
|
||||
- self._build_oniguruma()
|
||||
- self._build_libjq()
|
||||
- build_ext.run(self)
|
||||
-
|
||||
- def _build_oniguruma(self):
|
||||
- self._build_lib(
|
||||
- source_url="https://github.com/kkos/oniguruma/releases/download/v5.9.6/onig-5.9.6.tar.gz",
|
||||
- tarball_path=oniguruma_lib_tarball_path,
|
||||
- lib_dir=oniguruma_lib_build_dir,
|
||||
- commands=[
|
||||
- ["./configure", "CFLAGS=-fPIC", "--prefix=" + oniguruma_lib_install_dir],
|
||||
- ["make"],
|
||||
- ["make", "install"],
|
||||
- ])
|
||||
-
|
||||
-
|
||||
- def _build_libjq(self):
|
||||
- self._build_lib(
|
||||
- source_url="https://github.com/stedolan/jq/archive/jq-1.5.tar.gz",
|
||||
- tarball_path=jq_lib_tarball_path,
|
||||
- lib_dir=jq_lib_dir,
|
||||
- commands=[
|
||||
- ["autoreconf", "-i"],
|
||||
- ["./configure", "CFLAGS=-fPIC", "--disable-maintainer-mode", "--with-oniguruma=" + oniguruma_lib_install_dir],
|
||||
- ["make"],
|
||||
- ])
|
||||
-
|
||||
- def _build_lib(self, source_url, tarball_path, lib_dir, commands):
|
||||
- self._download_tarball(source_url, tarball_path)
|
||||
-
|
||||
- macosx_deployment_target = sysconfig.get_config_var("MACOSX_DEPLOYMENT_TARGET")
|
||||
- if macosx_deployment_target:
|
||||
- os.environ['MACOSX_DEPLOYMENT_TARGET'] = macosx_deployment_target
|
||||
-
|
||||
- def run_command(args):
|
||||
- print("Executing: %s" % ' '.join(args))
|
||||
- subprocess.check_call(args, cwd=lib_dir)
|
||||
-
|
||||
- for command in commands:
|
||||
- run_command(command)
|
||||
-
|
||||
- def _download_tarball(self, source_url, tarball_path):
|
||||
- if os.path.exists(tarball_path):
|
||||
- os.unlink(tarball_path)
|
||||
- urlretrieve(source_url, tarball_path)
|
||||
-
|
||||
- if os.path.exists(jq_lib_dir):
|
||||
- shutil.rmtree(jq_lib_dir)
|
||||
- tarfile.open(tarball_path, "r:gz").extractall(path_in_dir("."))
|
||||
-
|
||||
-
|
||||
jq_extension = Extension(
|
||||
"jq",
|
||||
sources=["jq.c"],
|
||||
- include_dirs=[jq_lib_dir],
|
||||
- extra_objects=[
|
||||
- os.path.join(jq_lib_dir, ".libs/libjq.a"),
|
||||
- os.path.join(oniguruma_lib_install_dir, "lib/libonig.a"),
|
||||
- ],
|
||||
+ libraries=["jq"],
|
||||
)
|
||||
|
||||
setup(
|
||||
@@ -107,7 +30,6 @@ setup(
|
||||
url='http://github.com/mwilliamson/jq.py',
|
||||
license='BSD 2-Clause',
|
||||
ext_modules = [jq_extension],
|
||||
- cmdclass={"build_ext": jq_build_ext},
|
||||
classifiers=[
|
||||
'Development Status :: 4 - Beta',
|
||||
'Intended Audience :: Developers',
|
||||
@@ -123,4 +45,3 @@ setup(
|
||||
'Programming Language :: Python :: 3.5',
|
||||
],
|
||||
)
|
||||
-
|
||||
--
|
||||
2.19.2
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jsonrpclib-pelix";
|
||||
version = "0.3.2";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "14d288d1b3d3273cf96a729dd21a2470851c4962be8509f3dd62f0137ff90339";
|
||||
sha256 = "1pimyq95w99ik5av96j0n9i6n12mr9kk0y28jnrq0555d7hmii8r";
|
||||
};
|
||||
|
||||
doCheck = false; # test_suite="tests" in setup.py but no tests in pypi.
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-benchmark";
|
||||
version = "3.1.1";
|
||||
version = "3.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ionelmc";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1ch079dlc6c9ag74dh4dg6plkmh0h8kn78ari3fgadc75bald71m";
|
||||
sha256 = "1hslzzinpwc1zqhbpllqh3sllmiyk69pcycl7ahr0rz3micgwczj";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pytest py-cpuinfo ] ++ lib.optional (pythonOlder "3.4") [ pathlib statistics ];
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-gitlab";
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "20ceb9232f9a412ce6554056a6b5039013d0755261d57b5c8ada7035773de795";
|
||||
sha256 = "17nh09c28vf2daamyq97bdzgr685lyh668haisqbbp5lkn9gh7j0";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests six ];
|
||||
|
||||
@@ -1,26 +1,30 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, pytest
|
||||
, sphinx
|
||||
, CommonMark_54
|
||||
, CommonMark
|
||||
, docutils
|
||||
, sphinx
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "recommonmark";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "6e29c723abcf5533842376d87c4589e62923ecb6002a8e059eb608345ddaff9d";
|
||||
# PyPI tarball is missing some test files: https://github.com/rtfd/recommonmark/pull/128
|
||||
src = fetchFromGitHub {
|
||||
owner = "rtfd";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "04bjqx2hczmg7rnj2rpsjk7h24diwk83s6fhgrxk00k40w2bpz5j";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest sphinx ];
|
||||
propagatedBuildInputs = [ CommonMark_54 docutils ];
|
||||
checkInputs = [ pytest ];
|
||||
propagatedBuildInputs = [ CommonMark docutils sphinx ];
|
||||
|
||||
# No tests in archive
|
||||
doCheck = false;
|
||||
checkPhase = ''
|
||||
py.test
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A docutils-compatibility bridge to CommonMark";
|
||||
@@ -28,4 +32,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fridh ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,12 +15,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "trio";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "6d905d950dfa1db3fad6b5ef5637c221947123fd2b0e112033fecfc582318c3b";
|
||||
sha256 = "1c1snnhjg8l87ygf5p9z2qjcq090mws5w7pr9aaiava0yqawq8yk";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest pyopenssl trustme jedi pylint ];
|
||||
|
||||
Reference in New Issue
Block a user