Merge branch 'master' into rpc

Conflicts:
	linux/ws_main.py
	linux_dpdk/ws_main.py

1 files changed, 0 insertions, 106 deletions

diff --git a/scripts/automation/trex_control_plane/python_lib/python-daemon-2.0.5/setup.py b/scripts/automation/trex_control_plane/python_lib/python-daemon-2.0.5/setup.py
deleted file mode 100755
index 16a6a6a6..00000000
--- a/scripts/automation/trex_control_plane/python_lib/python-daemon-2.0.5/setup.py
+++ /dev/null
@@ -1,106 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# setup.py
-# Part of ‘python-daemon’, an implementation of PEP 3143.
-#
-# Copyright © 2008–2015 Ben Finney <ben+python@benfinney.id.au>
-# Copyright © 2008 Robert Niederreiter, Jens Klein
-#
-# This is free software: you may copy, modify, and/or distribute this work
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; version 3 of that license or any later version.
-# No warranty expressed or implied. See the file ‘LICENSE.GPL-3’ for details.
-
-""" Distribution setup for ‘python-daemon’ library. """
-
-from __future__ import (absolute_import, unicode_literals)
-
-import sys
-import os
-import os.path
-import pydoc
-import distutils.util
-
-from setuptools import (setup, find_packages)
-
-import version
-
-
-fromlist_expects_type = str
-if sys.version_info < (3, 0):
-    fromlist_expects_type = bytes
-
-
-main_module_name = 'daemon'
-main_module_fromlist = list(map(fromlist_expects_type, [
-        '_metadata']))
-main_module = __import__(
-        main_module_name,
-        level=0, fromlist=main_module_fromlist)
-metadata = main_module._metadata
-
-(synopsis, long_description) = pydoc.splitdoc(pydoc.getdoc(main_module))
-
-version_info = metadata.get_distribution_version_info()
-version_string = version_info['version']
-
-(maintainer_name, maintainer_email) = metadata.parse_person_field(
-        version_info['maintainer'])
-
-
-setup(
-        name=metadata.distribution_name,
-        version=version_string,
-        packages=find_packages(exclude=["test"]),
-        cmdclass={
-            "write_version_info": version.WriteVersionInfoCommand,
-            "egg_info": version.EggInfoCommand,
-            },
-
-        # Setuptools metadata.
-        maintainer=maintainer_name,
-        maintainer_email=maintainer_email,
-        zip_safe=False,
-        setup_requires=[
-            "docutils",
-            ],
-        test_suite="unittest2.collector",
-        tests_require=[
-            "unittest2 >=0.6",
-            "testtools",
-            "testscenarios >=0.4",
-            "mock >=1.0",
-            "docutils",
-            ],
-        install_requires=[
-            "setuptools",
-            "docutils",
-            "lockfile >=0.10",
-            ],
-
-        # PyPI metadata.
-        author=metadata.author_name,
-        author_email=metadata.author_email,
-        description=synopsis,
-        license=metadata.license,
-        keywords="daemon fork unix".split(),
-        url=metadata.url,
-        long_description=long_description,
-        classifiers=[
-            # Reference: http://pypi.python.org/pypi?%3Aaction=list_classifiers
-            "Development Status :: 4 - Beta",
-            "License :: OSI Approved :: Apache Software License",
-            "Operating System :: POSIX",
-            "Programming Language :: Python :: 2.7",
-            "Programming Language :: Python :: 3",
-            "Intended Audience :: Developers",
-            "Topic :: Software Development :: Libraries :: Python Modules",
-            ],
-        )
-
-
-# Local variables:
-# coding: utf-8
-# mode: python
-# End:
-# vim: fileencoding=utf-8 filetype=python :