update setup.py to leverage extra_requires and updates to pipfile dependencies

daemon/Pipfile

@@ -18,7 +18,7 @@ mock = "*"
 
 [packages]
 configparser = "*"
-enum34 = "*"
+enum34 = {markers = "python_version < '3.4'"}
 future = "*"
 futures = {markers = "python_version < '3.2'"}
 grpcio = "*"

daemon/Pipfile.lock

@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "f67325e2ce83ca781a8ad19183ac02f364f746a66ac245df25b6d37962ad2561"
+            "sha256": "7bbe8f754e71f84d32e9ef7d33b595e3c70011f1d871a2f702167d10326ce6a2"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -30,6 +30,7 @@
                 "sha256:8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1"
             ],
             "index": "pypi",
+            "markers": "python_version < '3.4'",
             "version": "==1.1.6"
         },
         "future": {
@@ -214,16 +215,6 @@
             ],
             "version": "==0.3"
         },
-        "enum34": {
-            "hashes": [
-                "sha256:2d81cbbe0e73112bdfe6ef8576f2238f2ba27dd0d55752a776c41d38b7da2850",
-                "sha256:644837f692e5f550741432dd3f223bbb9852018674981b1664e5dc339387588a",
-                "sha256:6bd0f6ad48ec2aa117d3d141940d484deccda84d4fcd884f5c3d93c23ecd8c79",
-                "sha256:8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1"
-            ],
-            "index": "pypi",
-            "version": "==1.1.6"
-        },
         "flake8": {
             "hashes": [
                 "sha256:19241c1cbc971b9962473e4438a2ca19749a7dd002dd1a946eaba171b4114548",

daemon/setup.py.in

@@ -23,16 +23,9 @@ def recursive_files(data_path, files_path):
     return all_files
 
 
-def glob_files(glob_path):
-    return glob.glob(glob_path)
-
-
 data_files = [
-    (_CORE_DIR, [
+    (_CORE_DIR, glob.glob("data/*")),
-        "data/core.conf",
+    (_MAN_DIR, glob.glob("../man/**.1")),
-        "data/logging.conf",
-    ]),
-    (_MAN_DIR, glob_files("../man/**.1")),
 ]
 data_files.extend(recursive_files(_EXAMPLES_DIR, "examples"))
 
@@ -42,15 +35,17 @@ setup(
     packages=find_packages(),
     install_requires=[
         "configparser",
-        "enum34",
         "future",
         "grpcio",
-        "lxml"
+        "lxml",
+        "protobuf",
     ],
+    extra_require={
+        ":python_version<'3.2'": ["futures"],
+        ":python_version<'3.4'": ["enum34"],
+    },
     tests_require=[
         "pytest",
-        "pytest-runner",
-        "pytest-cov",
         "mock",
     ],
     data_files=data_files,

daemon/test.py

@@ -1,8 +0,0 @@
-import sys
-
-import pytest
-
-distributed = sys.argv[1]
-pytest.main(
-    ["-v", "--distributed", distributed, "--cov-report", "xml", "--cov=.", "tests"]
-)