summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorFabian Affolter <fabian@affolter-engineering.ch>2021-06-10 09:48:15 +0200
committerGitHub <noreply@github.com>2021-06-10 09:48:15 +0200
commit076ab37cc93d212cfba1beb729f3be452da44d30 (patch)
tree9a1cee27c9e7c21875f4c548e6e00d695565f652 /pkgs
parent2ee781417e9da2b553db0ab777aa89cd81fab54e (diff)
parent052e0227f7e26ed7ca525a0d2f9bf9c1fc2cbef1 (diff)
downloadnixpkgs-076ab37cc93d212cfba1beb729f3be452da44d30.tar
nixpkgs-076ab37cc93d212cfba1beb729f3be452da44d30.tar.gz
nixpkgs-076ab37cc93d212cfba1beb729f3be452da44d30.tar.bz2
nixpkgs-076ab37cc93d212cfba1beb729f3be452da44d30.tar.lz
nixpkgs-076ab37cc93d212cfba1beb729f3be452da44d30.tar.xz
nixpkgs-076ab37cc93d212cfba1beb729f3be452da44d30.tar.zst
nixpkgs-076ab37cc93d212cfba1beb729f3be452da44d30.zip
Merge pull request #126242 from fabaff/bump-datasette
python3Packages.datasette: 0.54.1 -> 0.57.1
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/python-modules/datasette/default.nix41
1 files changed, 24 insertions, 17 deletions
diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix
index 1d919de6ee8..58920b40646 100644
--- a/pkgs/development/python-modules/datasette/default.nix
+++ b/pkgs/development/python-modules/datasette/default.nix
@@ -5,6 +5,7 @@
 , asgi-csrf
 , click
 , click-default-group
+, itsdangerous
 , janus
 , jinja2
 , hupper
@@ -17,56 +18,62 @@
 , httpx
 # Check Inputs
 , pytestCheckHook
-, pytestrunner
+, pytest-runner
 , pytest-asyncio
+, pytest-timeout
 , aiohttp
 , beautifulsoup4
 , asgiref
 , setuptools
+, trustme
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "datasette";
-  version = "0.54.1";
+  version = "0.57.1";
+  disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "simonw";
-    repo = "datasette";
+    repo = pname;
     rev = version;
-    sha256 = "sha256-Ixh56X9dI/FIJPXHXXGnFiYj3qeBmvW5L1FF7/0ofUQ=";
+    sha256 = "sha256-BHsf3GOganPhsDiZlRxvAsRZH/Sq+Jr+CZcc2ubce+8=";
   };
 
-  nativeBuildInputs = [ pytestrunner ];
+  nativeBuildInputs = [ pytest-runner ];
 
   propagatedBuildInputs = [
     aiofiles
     asgi-csrf
+    asgiref
     click
     click-default-group
+    httpx
+    hupper
+    itsdangerous
     janus
     jinja2
-    hupper
     mergedeep
     pint
     pluggy
     python-baseconv
     pyyaml
-    uvicorn
     setuptools
-    httpx
-    asgiref
+    uvicorn
   ];
 
   checkInputs = [
-    pytestCheckHook
-    pytest-asyncio
     aiohttp
     beautifulsoup4
+    pytest-asyncio
+    pytest-timeout
+    pytestCheckHook
+    trustme
   ];
 
   postConfigure = ''
     substituteInPlace setup.py \
-      --replace "click~=7.1.1" "click" \
       --replace "click-default-group~=1.2.2" "click-default-group" \
       --replace "hupper~=1.9" "hupper" \
       --replace "pint~=0.9" "pint" \
@@ -75,12 +82,13 @@ buildPythonPackage rec {
       --replace "PyYAML~=5.3" "PyYAML"
   '';
 
-  # takes 30-180 mins to run entire test suite, not worth the cpu resources, slows down reviews
-  # with pytest-xdist, it still takes around 10mins with 32 cores
+  # takes 30-180 mins to run entire test suite, not worth the CPU resources, slows down reviews
+  # with pytest-xdist, it still takes around 10 mins with 32 cores
   # just run the csv tests, as this should give some indictation of correctness
   pytestFlagsArray = [
     "tests/test_csv.py"
   ];
+
   disabledTests = [
     "facet"
     "_invalid_database" # checks error message when connecting to invalid database
@@ -97,10 +105,9 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
-    description = "An instant JSON API for your SQLite databases";
-    homepage = "https://github.com/simonw/datasette";
+    description = "Multi-tool for exploring and publishing data";
+    homepage = "https://datasette.io/";
     license = licenses.asl20;
     maintainers = [ maintainers.costrouc ];
   };
-
 }