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

Commits on Nov 4, 2018

  1. fix release build w.r.t. mypy 

    Mypy was added to the wrong build output.
    @Mic92
    Mic92 committed Nov 4, 2018

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 82AE0A31B33CEFCF
    Learn about vigilant mode
    Copy the full SHA
    51bb9bc View commit details

Commits on Nov 5, 2018

  1. Merge pull request #1041 from Mic92/mypy-fix 

    fix release build w.r.t. mypy
    @domenkozar
    domenkozar authored Nov 5, 2018

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 82AE0A31B33CEFCF
    Learn about vigilant mode
    Copy the full SHA
    aa3602d View commit details
Showing with 5 additions and 3 deletions.
  1. +5 −3 release.nix
8 changes: 5 additions & 3 deletions release.nix
View file
Original file line number Diff line number Diff line change
@@ -22,8 +22,6 @@ rec {

buildInputs = [ pkgs.git pkgs.libxslt pkgs.docbook5_xsl ];

nativeBuildInputs = [ pkgs.mypy ];

postUnpack = ''
# Clean up when building from a working tree.
if [ -d $sourceRoot/.git ]; then
@@ -79,6 +77,8 @@ rec {

buildInputs = [ python2Packages.nose python2Packages.coverage ];

nativeBuildInputs = [ pkgs.mypy ];

propagatedBuildInputs = with python2Packages;
[ prettytable
boto
@@ -107,8 +107,10 @@ rec {

doCheck = true;

# We have to unset PYTHONPATH here since it will pick enum34 which collides
# with python3 own module. This can be removed when nixops is ported to python3.
postCheck = ''
mypy --cache-dir=/dev/null nixops
PYTHONPATH= mypy --cache-dir=/dev/null nixops
'';

# Needed by libcloud during tests