python bazel

WORKSPACE

@@ -29,11 +29,27 @@ nixpkgs_git_repository(
 
 nixpkgs_cc_configure(repository = "@nixpkgs//:default.nix")
 
+nixpkgs_package(
+    name = "z3",
+    repositories = { "nixpkgs": "@nixpkgs//:default.nix" }
+)
+
+# Python
 nixpkgs_python_configure(
     python3_attribute_path = "python3",
     repository = "@nixpkgs//:default.nix",
 )
 
+http_archive(
+    name = "rules_python",
+    url = "https://github.com/bazelbuild/rules_python/releases/download/0.1.0/rules_python-0.1.0.tar.gz",
+    sha256 = "b6d46438523a3ec0f3cead544190ee13223a52f6a6765a29eae7b7cc24cc83a0",
+)
+
+load("@rules_python//python:pip.bzl", "pip_install")
+
+pip_install(requirements = "//src/ldfi:requirements.txt")
+
 # Golang
 http_archive(
     name = "io_bazel_rules_go",

src/ldfi/BUILD.bazel

@@ -0,0 +1,17 @@
+load("@pip//:requirements.bzl", "requirement")
+load("@rules_python//python:defs.bzl", "py_test")
+
+py_test(
+    name = "ldfi_test",
+    main = "tests/test_ldfi.py",
+    srcs = ["tests/test_ldfi.py"],
+    imports = [".."],
+    deps = [
+        requirement("z3-solver"),
+        "//src/ldfi/src:ldfi_lib",
+    ],
+    data = ["@z3//:bin"],
+    env = {
+        "Z3_LIBRARY_PATH": "/nix/store/zdaninww6cyh3h9aj7w0kymz8c13b1q4-z3-4.8.9-lib/lib"
+    }
+)

src/ldfi/release.nix

@@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec {
     export SETUPTOOLS_SCM_PRETEND_VERSION="${lib.commitIdFromGitRepo ./../../.git}"
   '';
 
-  checkInputs = with pythonPackages; [ pytest pytestrunner ];
+  checkInputs = with pythonPackages; [ z3 pytest pytestrunner ];
   propagatedBuildInputs = with pythonPackages; [ z3-solver setuptools setuptools_scm ];
 
   checkPhase = "pytest --capture=tee-sys";

src/ldfi/requirements.txt

@@ -0,0 +1,2 @@
+z3-solver>=4.8.9.0
+setuptools

src/ldfi/setup.py

@@ -8,11 +8,15 @@
     author='Stevan Andjelkovic',
     author_email='[email protected]',
     license='BSD 2-clause',
-    packages=setuptools.find_packages(),
+    packages=setuptools.find_packages(where='src'),
     python_requires='>=3.6',
     install_requires=['z3-solver>=4.8.9.0'],
     setup_requires=['pytest-runner'],
     tests_require=['pytest'],
-    scripts=['bin/detsys-ldfi'],
+    entry_points={
+        'console_scripts': [
+            'detsys-ldfi=ldfi:main',
+        ],
+    },
     classifiers=[],
 )

src/ldfi/shell.nix

@@ -13,5 +13,5 @@ let
 in
 
 mkShell {
-  buildInputs = [ pythonEnv mypy black ];
+  buildInputs = [ pythonEnv z3 mypy black ];
 }

src/ldfi/src/BUILD.bazel

@@ -0,0 +1,22 @@
+load("@pip//:requirements.bzl", "requirement")
+load("@rules_python//python:defs.bzl", "py_library", "py_binary")
+
+py_library(
+    name = "ldfi_lib",
+    srcs = ["ldfi.py"],
+    srcs_version = "PY3",
+    visibility = ["//src/ldfi:__subpackages__"],
+    deps = [
+        requirement("z3-solver"),
+        requirement("setuptools"),
+    ],
+)
+
+py_binary(
+    name = "ldfi",
+    srcs = ["__init__.py"],
+    main = "__init__.py",
+    deps = [
+        ":ldfi_lib"
+    ],
+)

src/ldfi/src/__init__.py

@@ -0,0 +1,4 @@
+import ldfi
+
+def main():
+    ldfi.main()

src/ldfi/ldfi/__init__.py → src/ldfi/src/ldfi.py

@@ -234,6 +234,3 @@ def main():
     storage.store(event)
     logging.debug(event.faults)
     print(event.faults)
-
-if __name__ == '__main__':
-    main()

src/ldfi/tests/test_ldfi.py

@@ -1,11 +1,11 @@
 import json
-import ldfi
 import tempfile
 import logging
 import os
 import sqlite3
 import z3
 from z3 import (And, Or, Not, Bool)
+import ldfi
 
 def test_sorted_faults():
     l = sorted([{"kind": "omission", "from": "frontend", "to": "register2", "at": 2},