diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-08-06 01:39:53 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-08-06 01:39:53 +0200 |
| commit | 127095a321018ad95e60de1e95d1520c79b020a1 (patch) | |
| tree | 51c267dd01ea12b51109521c2ec570681e1b63ec | |
| parent | 405b78d76931e374a15ed7573b91b93522f51f28 (diff) | |
Updated from global requirements
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Change-Id: I19049637a64628e266de4e5bdd825435ca0bebe3
| -rw-r--r-- | requirements.txt | 7 | ||||
| -rw-r--r-- | setup.py | 8 | ||||
| -rw-r--r-- | test-requirements.txt | 6 |
3 files changed, 5 insertions, 16 deletions
diff --git a/requirements.txt b/requirements.txt index b3e0a620..1aa2a403 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,10 +2,10 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. pbr!=2.1.0 # Apache-2.0 -stevedore # Apache-2.0 +stevedore!=3.0.0 # Apache-2.0 PyYAML # MIT enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD -requests!=2.20.0 # Apache-2.0 +requests!=2.20.0,!=2.24.0 # Apache-2.0 robotframework>=3.0 behave>=1.2.6 behave-html-formatter>=0.9.4;python_version>='3.6' @@ -13,8 +13,7 @@ mock!=4.0.0,!=4.0.1 # BSD PrettyTable<0.8 # BSD six # MIT python-subunit # Apache-2.0/BSD -os-testr<2.0.0;python_version=='2.7' # Apache-2.0 -os-testr;python_version>='3.6' # Apache-2.0 +os-testr # Apache-2.0 junitxml boto3 # Apache-2.0 lxml!=3.7.0 # BSD @@ -16,14 +16,6 @@ # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT 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>=2.0.0'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index fa0045ff..9e729a60 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,12 +6,10 @@ mock!=4.0.0,!=4.0.1 # BSD nose # LGPL flake8<2.6.0,>=2.5.4 # MIT pylint # GPLv2 -sphinx!=1.6.6,!=1.6.7,<2.0.0;python_version=='2.7' # BSD -sphinx!=1.6.6,!=1.6.7,!=2.1.0,!=3.0.0;python_version>='3.4' # BSD +sphinx!=1.6.6,!=1.6.7,!=2.1.0,!=3.0.0 # BSD sphinx-rtd-theme yamllint doc8 # Apache-2.0 -bashate<1.0.0;python_version=='2.7' # Apache-2.0 -bashate;python_version>='3.6' # Apache-2.0 +bashate # Apache-2.0 ansible-lint bandit |