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: 8b079c241782
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c24eb82c7d38
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 17, 2019

  1. python35Packages.sqlalchemy: fix tests

    Jonathan Ringer committed Oct 17, 2019
    Copy the full SHA
    d4d0536 View commit details

  2. Merge pull request #71253 from jonringer/fix-python35-sqlalchemy 

    python35Packages.sqlalchemy: fix tests
    @worldofpeace
    worldofpeace authored Oct 17, 2019
    Copy the full SHA
    c24eb82 View commit details
Showing with 4 additions and 2 deletions.
  1. +4 −2 pkgs/development/python-modules/sqlalchemy/default.nix
6 changes: 4 additions & 2 deletions pkgs/development/python-modules/sqlalchemy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, fetchPypi, buildPythonPackage, isPy3k
{ lib, fetchPypi, buildPythonPackage, isPy3k, isPy35
, mock
, pysqlite
, pytest
@@ -22,7 +22,9 @@ buildPythonPackage rec {
sed -e 's:--max-worker-restart=5::g' -i setup.cfg
'';

checkPhase = ''
checkPhase = if isPy35 then ''
pytest test -k 'not exception_persistent_flush_py3k'
'' else ''
pytest test
'';