From 7c94bb3d81a1caabe54afef0387d7055e4e08f45 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 11 Aug 2017 10:40:33 +0200 Subject: Move promise package to root directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It seems mandatory as Functest must install promise in editable mode. Then npm install can be called in the source directory. It completes "Add promise package" [1] It would have worked well in classical mode. [1] https://gerrit.opnfv.org/gerrit/#/c/38639/ Change-Id: Ia9ae55b127d0d324d97974f5e9b1923d7636d7cd Signed-off-by: Cédric Ollivier --- promise/test/functest/requirements.txt | 1 - promise/test/functest/setup.cfg | 8 -------- promise/test/functest/setup.py | 22 ---------------------- requirements.txt | 1 + setup.cfg | 8 ++++++++ setup.py | 22 ++++++++++++++++++++++ 6 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 promise/test/functest/requirements.txt delete mode 100644 promise/test/functest/setup.cfg delete mode 100644 promise/test/functest/setup.py create mode 100644 requirements.txt create mode 100644 setup.cfg create mode 100644 setup.py diff --git a/promise/test/functest/requirements.txt b/promise/test/functest/requirements.txt deleted file mode 100644 index d39c387..0000000 --- a/promise/test/functest/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -functest diff --git a/promise/test/functest/setup.cfg b/promise/test/functest/setup.cfg deleted file mode 100644 index a05c5a5..0000000 --- a/promise/test/functest/setup.cfg +++ /dev/null @@ -1,8 +0,0 @@ -[metadata] -name = promise -version = 2017.9.0 -home-page = https://wiki.opnfv.org/display/promise/Promise - -[files] -packages = . -scripts = run_promise_tests.py diff --git a/promise/test/functest/setup.py b/promise/test/functest/setup.py deleted file mode 100644 index a1e9b3b..0000000 --- a/promise/test/functest/setup.py +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2017 Orange and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 - -import setuptools - -# In python < 2.7.4, a lazy loading of package `pbr` will break -# setuptools if some other modules registered functions in `atexit`. -# solution from: http://bugs.python.org/issue15881#msg170215 -try: - import multiprocessing # noqa -except ImportError: - pass - -setuptools.setup( - setup_requires=['pbr>=1.8'], - pbr=True) diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..d39c387 --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +functest diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..dcdaa25 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,8 @@ +[metadata] +name = promise +version = 2017.9.0 +home-page = https://wiki.opnfv.org/display/promise/Promise + +[files] +packages = promise/test/functest +scripts = promise/test/functest/run_promise_tests.py diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..a1e9b3b --- /dev/null +++ b/setup.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python + +# Copyright (c) 2017 Orange and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 + +import setuptools + +# In python < 2.7.4, a lazy loading of package `pbr` will break +# setuptools if some other modules registered functions in `atexit`. +# solution from: http://bugs.python.org/issue15881#msg170215 +try: + import multiprocessing # noqa +except ImportError: + pass + +setuptools.setup( + setup_requires=['pbr>=1.8'], + pbr=True) -- cgit 1.2.3-korg