git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #84197 from drewrisinger/dr-pr-python-pint

pythonPackages.pint: 0.9 -> 0.11

commitf6b382b25af4bea30a12d1483fcbef8886adbc5d authorBenjamin Hipple <bhipple@protonmail.com> dateFri 3 Apr 2020, 17:42 (7 years ago) parentc51ba89fb25290
2 files changed+55−24
pkgs/development/python-modules/datasette/default.nix+32−21 pkgs/development/python-modules/pint/default.nix+23−3
pkgs/development/python-modules/datasette/default.nix+32−21
@@ -1,49 +1,52 @@
11{ lib
22, buildPythonPackage
33, fetchFromGitHub
4+, aiofiles
45, click
56, click-default-group
7+, janus
68, jinja2
79, hupper
810, pint
911, pluggy
10−, pytest
12+, uvicorn
13+# Check Inputs
14+, pytestCheckHook
1115, pytestrunner
1216, pytest-asyncio
1317, black
1418, aiohttp
1519, beautifulsoup4
16−, uvicorn
1720, asgiref
18−, aiofiles
1921}:
2022
2123buildPythonPackage rec {
2224 pname = "datasette";
23− version = "0.35";
25+ version = "0.39";
2426
2527 src = fetchFromGitHub {
2628 owner = "simonw";
2729 repo = "datasette";
2830 rev = version;
29− sha256 = "0v6af7agg27lapz1nbab07595v4hl2x5wm2f03drj81f7pm8y7hc";
31+ sha256 = "07d46512bc9sdan9lv39sf1bwlf7vf1bfhcsm825vk7sv7g9kczd";
3032 };
3133
3234 nativeBuildInputs = [ pytestrunner ];
3335
3436 propagatedBuildInputs = [
37+ aiofiles
3538 click
3639 click-default-group
40+ janus
3741 jinja2
3842 hupper
3943 pint
4044 pluggy
4145 uvicorn
42− aiofiles
4346 ];
4447
4548 checkInputs = [
46− pytest
49+ pytestCheckHook
4750 pytest-asyncio
4851 aiohttp
4952 beautifulsoup4
@@ -53,24 +56,32 @@ buildPythonPackage rec {
5356
5457 postConfigure = ''
5558 substituteInPlace setup.py \
56− --replace "click-default-group==1.2" "click-default-group" \
57− --replace "Sanic==0.7.0" "Sanic" \
58− --replace "hupper==1.0" "hupper" \
59− --replace "pint~=0.8.1" "pint" \
60− --replace "pluggy~=0.12.0" "pint" \
61− --replace "Jinja2==2.10.1" "Jinja2" \
62− --replace "uvicorn~=0.8.4" "uvicorn"
59+ --replace "click~=7.1.1" "click" \
60+ --replace "click-default-group~=1.2.2" "click-default-group" \
61+ --replace "Jinja2~=2.10.3" "Jinja2" \
62+ --replace "hupper~=1.9" "hupper" \
63+ --replace "pint~=0.9" "pint" \
64+ --replace "pluggy~=0.13.0" "pint" \
65+ --replace "uvicorn~=0.11" "uvicorn" \
66+ --replace "aiofiles~=0.4.0" "aiofiles" \
67+ --replace "janus~=0.4.0" "janus" \
68+ --replace "PyYAML~=5.3" "PyYAML"
6369 '';
6470
6571 # many tests require network access
6672 # test_black fails on darwin
67− checkPhase = ''
68− pytest --ignore tests/test_api.py \
69− --ignore tests/test_csv.py \
70− --ignore tests/test_html.py \
71− --ignore tests/test_black.py \
72− -k 'not facet'
73− '';
73+ dontUseSetuptoolsCheck = true;
74+ pytestFlagsArray = [
75+ "--ignore=tests/test_api.py"
76+ "--ignore=tests/test_csv.py"
77+ "--ignore=tests/test_html.py"
78+ "--ignore=tests/test_docs.py"
79+ "--ignore=tests/test_black.py"
80+ ];
81+ disabledTests = [
82+ "facet"
83+ "_invalid_database" # checks error message when connecting to invalid database
84+ ];
7485
7586 meta = with lib; {
7687 description = "An instant JSON API for your SQLite databases";
pkgs/development/python-modules/pint/default.nix+23−3
@@ -2,20 +2,40 @@
22, buildPythonPackage
33, fetchPypi
44, isPy27
5+, pythonOlder
56, funcsigs
7+, setuptools_scm
8+# Check Inputs
9+, pytestCheckHook
10+, numpy
11+, matplotlib
12+, uncertainties
613}:
714
815buildPythonPackage rec {
916 pname = "pint";
10− version = "0.9";
17+ version = "0.11";
1118
1219 src = fetchPypi {
1320 inherit version;
1421 pname = "Pint";
15− sha256 = "32d8a9a9d63f4f81194c0014b3b742679dce81a26d45127d9810a68a561fe4e2";
22+ sha256 = "0kfgnmcs6z9ndhzvwg2xzhpwxgyyagdsdz5dns1jy40fa1q113rh";
1623 };
1724
18− propagatedBuildInputs = lib.optional isPy27 funcsigs;
25+ disabled = pythonOlder "3.6";
26+
27+ propagatedBuildInputs = [
28+ setuptools_scm
29+ ] ++ lib.optional isPy27 funcsigs;
30+
31+ # Test suite explicitly requires pytest
32+ checkInputs = [
33+ pytestCheckHook
34+ numpy
35+ matplotlib
36+ uncertainties
37+ ];
38+ dontUseSetuptoolsCheck = true;
1939
2040 meta = with lib; {
2141 description = "Physical quantities module";