...
 
Commits (5)
No preview for this file type
......@@ -34,3 +34,17 @@ requirements.txt:
- integration
script:
- nix-shell $ARGOPKGS -A nrm --run "diff <(test/requirements.py) <(cat ./requirements.txt)"
flake8:
stage: style
script:
- nix run -f "$ARGOPKGS" python37Packages.flake8 --command flake8 "nrm/" "bin/"
tags:
- integration
black:
stage: style
script:
- nix run -f "$ARGOPKGS" python37Packages.black --command black "nrm/" "bin/" "--check"
tags:
- integration
{ src, stdenv, fetchurl, pythonPackages, writeText, autoreconfHook }:
{ src, stdenv, fetchurl, writeText, autoreconfHook }:
stdenv.mkDerivation rec {
inherit src;
name = "nrm-containers";
......
......@@ -8,7 +8,7 @@
, # fetcher alias for the remaining arguments
fetched ? s: (pkgs.nix-update-source.fetch s).src
, #source overrides: core nrm components
, #source overrides: core nrm components
aml-src ? fetched aml/pin.json
, numabench-src ? fetched numabench/pin.json
, excit-src ? fetched excit/pin.json
......@@ -31,6 +31,7 @@
, powerplots-src ? builtins.fetchGit {inherit (fetched powerplots/pin.json) url rev;}
, argonix-src ? builtins.fetchGit {inherit (fetched argonix/pin.json) url rev;}
, experiments-src ? fetched experiments/pin.json
, pytype-src ? fetched pytype/pin.json
, #used for hardware experiments.
sudoPath ? null
......@@ -63,20 +64,12 @@ let
};
numabench = callPackage ./numabench {src=numabench-src; hwloc = hwloc2;};
excit = callPackage ./excit {src=excit-src;};
nrm = (callPackage ./nrm {pythonPackages=pkgs.python34Full.pkgs; src=nrm-src;}).overrideAttrs (o:{
nrm = (callPackage ./nrm {pythonPackages=pkgs.python37Packages; src=nrm-src;}).overrideAttrs (o:{
installPhase=o.installPhase+''
mkdir -p $out/share
cp -r nrm/schemas $out/lib/python2.7/site-packages/nrm/
cp -r examples $out/share
'';
});
nrm-virtualenv = nrm.overrideAttrs (o:{
buildInputs=o.buildInputs ++ [ pkgs.blas pkgs.liblapack pkgs.binutils-unwrapped];
buildPhase=''
virtualenv .
bin/pip install -r requirements.txt
'';
});
containers = callPackage ./containers {src=containers-src;};
libnrm = callPackage ./libnrm {src=libnrm-src;};
libnrm-pinned = callPackage ./libnrm {src=fetched libnrm/pin.json;};
......@@ -188,6 +181,13 @@ let
zymake = callPackage ./zymake {
inherit (pkgs.ocamlPackages) findlib ocamlbuild topkg batteries;
};
pytype = callPackage ./pytype {
src = pytype-src;
pythonPackages = pkgs.pythonPackages;
importlab = callPackage ./importlab {pythonPackages = pkgs.pythonPackages;};
};
haskellPackages = pkgs.haskellPackages.override {
overrides = self: super: with pkgs.haskell.lib;
rec {
......@@ -275,7 +275,7 @@ let
});
# fix for nrm
pyzmq = pkgs.python34Packages.pyzmq.override { zeromq3 = pkgs.zeromq; };
pyzmq = pkgs.python37Packages.pyzmq.override { zeromq3 = pkgs.zeromq; };
hwloc2 = pkgs.hwloc.overrideAttrs (old:{
name="hwloc-2";
......
{ stdenv, fetchFromGitHub, pythonPackages }:
pythonPackages.buildPythonPackage rec {
name = "importlab";
src = fetchFromGitHub {
owner = "google";
repo = "importlab";
rev = "171d0b5687dd6a9d2c5b01b4b2c3ecce2d79dddb";
sha256 = "1qlz2b7271na0gpr6qgr43rqrmgg2g9gf1whbsg29d346578bbgv";
};
propagatedBuildInputs = [
pythonPackages.networkx
pythonPackages.six
];
checkPhase = "true";
}
......@@ -18,7 +18,7 @@ pythonPackages.buildPythonPackage {
#checkInputs = [ pythonPackages.pytest ];
#checkPhase = ''
checkPhase = "true";
#py.test $out
#'';
}
{ src, stdenv, pythonPackages, importlab, cmake, bison , flex, python , ninja} :
pythonPackages.buildPythonPackage {
inherit src;
name = "pytype";
propagatedBuildInputs = [
ninja
importlab
pythonPackages.six
pythonPackages.pyyaml
];
buildInputs = [
bison
flex
python
cmake
];
checkPhase = "true";
patches = ./dep.patch;
}
diff --git a/pytype/typeshed b/pytype/typeshed
deleted file mode 120000
index e4d38331..00000000
--- a/pytype/typeshed
+++ /dev/null
@@ -1 +0,0 @@
-../typeshed
\ No newline at end of file
diff --git a/setup.py b/setup.py
index e535703f..d5ccf8cb 100644
--- a/setup.py
+++ b/setup.py
@@ -110,8 +110,6 @@ def get_version():
def get_install_requires():
requires = [
- 'importlab (>=0.5.1)',
- 'ninja',
'pyyaml (>=3.11)',
'six',
]
{
"fetch": {
"args": {
"fetchSubmodules": true,
"rev": "27eb234da9f3477156dc653114867d07fc2353c9",
"sha256": "073v7ihdb1n3fr6z2hk371vd4irdpvw5p9z1jk7frdjndkci7x0a",
"url": "https://github.com/google/pytype.git"
},
"fn": "fetchgit"
},
"rev": "refs/heads/master",
"submodules": true,
"type": "fetchgit",
"url": "https://github.com/google/pytype.git"
}
\ No newline at end of file