Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bf93cdca0d27
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 505a83ae1017
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 31, 2019

  1. pythonPackages.datasette: 0.27 -> 0.28

    @costrouc
    costrouc committed May 31, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: CED392DE0C483D00
    Learn about vigilant mode
    Copy the full SHA
    46976ef View commit details

Commits on Jun 1, 2019

  1. Merge pull request #62311 from costrouc/python-datasette-upgrade 

    pythonPackages.datasette: 0.27 -> 0.28
    @worldofpeace
    worldofpeace authored Jun 1, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: CED392DE0C483D00
    Learn about vigilant mode
    Copy the full SHA
    505a83a View commit details
Showing with 6 additions and 6 deletions.
  1. +6 −6 pkgs/development/python-modules/datasette/default.nix
12 changes: 6 additions & 6 deletions pkgs/development/python-modules/datasette/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,19 +11,20 @@
, pytest
, pytestrunner
, pytest-asyncio
, black
, aiohttp
, beautifulsoup4
}:

buildPythonPackage rec {
pname = "datasette";
version = "0.27";
version = "0.28";

src = fetchFromGitHub {
owner = "simonw";
repo = "datasette";
rev = version;
sha256 = "02k1kk6bw034rs74w0viwzapxz684lqgjvw5q5j5xgr0i4kynylp";
sha256 = "1m2s03gyq0ghjc3s0b5snpinisddywpgii2f0zqa3v4ljmzanx7h";
};

buildInputs = [ pytestrunner ];
@@ -43,24 +44,23 @@ buildPythonPackage rec {
pytest-asyncio
aiohttp
beautifulsoup4
black
];

postConfigure = ''
substituteInPlace setup.py \
--replace "click==6.7" "click" \
--replace "click-default-group==1.2" "click-default-group" \
--replace "Sanic==0.7.0" "Sanic" \
--replace "hupper==1.0" "hupper" \
--replace "pint==0.8.1" "pint" \
--replace "Jinja2==2.10" "Jinja2"
--replace "Jinja2==2.10.1" "Jinja2"
'';

# many tests require network access
checkPhase = ''
pytest --ignore tests/test_api.py \
--ignore tests/test_csv.py \
--ignore tests/test_html.py \
--ignore tests/test_publish_heroku.py
--ignore tests/test_html.py
'';

meta = with lib; {