Browse Source

Merge "sysinv: Cleanup requirements"

changes/29/787529/1
Zuul 2 months ago
committed by Gerrit Code Review
parent
commit
fd214d213e
7 changed files with 29 additions and 22 deletions
  1. +1
    -2
      sysinv/sysinv/centos/sysinv.spec
  2. +1
    -2
      sysinv/sysinv/debian/control
  3. +1
    -1
      sysinv/sysinv/opensuse/sysinv.spec
  4. +7
    -2
      sysinv/sysinv/sysinv/requirements.txt
  5. +10
    -4
      sysinv/sysinv/sysinv/sysinv/common/utils.py
  6. +9
    -3
      sysinv/sysinv/sysinv/sysinv/tests/test_utils.py
  7. +0
    -8
      sysinv/sysinv/sysinv/test-requirements.txt

+ 1
- 2
sysinv/sysinv/centos/sysinv.spec View File

@ -37,8 +37,7 @@ Requires: python-webob
Requires: python-webtest
Requires: python-wsme
Requires: python-six
Requires: python2-django
Requires: python2-mox3
Requires: python2-rfc3986
Requires: python2-oslo-i18n
Requires: python2-oslo-config
Requires: python2-oslo-concurrency


+ 1
- 2
sysinv/sysinv/debian/control View File

@ -16,9 +16,9 @@ Architecture: all
Depends: ${misc:Depends},
${python:Depends},
python-boto3,
python-django,
python-docker,
python-parted,
python-rfc3986,
python-six,
python-pyudev,
python-pbr,
@ -48,7 +48,6 @@ Depends: ${misc:Depends},
python-retrying,
python-sqlalchemy,
python-stevedore,
python-mox3,
python-pytest,
python-testtools,
tsconfig


+ 1
- 1
sysinv/sysinv/opensuse/sysinv.spec View File

@ -30,6 +30,7 @@ Requires: python2-keystonemiddleware
Requires: python2-kubernetes
Requires: python2-netaddr
Requires: python2-paste
Requires: python2-rfc3986
Requires: python2-pyudev
Requires: python2-pbr
Requires: python2-psutil
@ -41,7 +42,6 @@ Requires: python2-WSME
Requires: python2-six
Requires: python2-sqlalchemy
Requires: python2-stevedore
Requires: python2-mox3
Requires: python2-oslo.i18n
Requires: python2-oslo.config
Requires: python2-oslo.concurrency


+ 7
- 2
sysinv/sysinv/sysinv/requirements.txt View File

@ -1,7 +1,6 @@
pbr>=0.5
SQLAlchemy
amqplib>=0.6.1
argparse
boto3
botocore
cryptography!=2.0 # BSD/Apache-2.0
@ -19,6 +18,7 @@ iso8601>=0.1.4
oslo.i18n # Apache-2.0
oslo.config>=3.7.0 # Apache-2.0
oslo.concurrency>=3.7.1 # Apache-2.0
oslo.log # Apache-2.0
oslo.db>=4.1.0 # Apache-2.0
oslo.messaging!=9.0.0 # Apache-2.0
oslo.rootwrap>=5.8.0 # Apache-2.0
@ -45,4 +45,9 @@ rpm
ruamel.yaml>=0.13.14 # MIT
docker # Apache-2.0
kubernetes # Apache-2.0
Django
pyudev
migrate
python-ldap>=3.1.0
psycopg2-binary
python-barbicanclient
rfc3986

+ 10
- 4
sysinv/sysinv/sysinv/sysinv/common/utils.py View File

@ -49,6 +49,7 @@ import os
import pwd
import random
import re
import rfc3986
import shutil
import signal
import six
@ -62,7 +63,6 @@ import uuid
import wsme
import yaml
from django.core.validators import URLValidator
from eventlet.green import subprocess
from eventlet import greenthread
import netaddr
@ -1812,11 +1812,17 @@ def is_openstack_applied(dbapi):
def is_url(url_str):
uri = rfc3986.uri_reference(url_str)
validator = rfc3986.validators.Validator().require_presence_of(
'scheme', 'host',
).check_validity_of(
'scheme', 'host', 'path',
)
try:
URLValidator()(url_str)
return True
except Exception:
validator.validate(uri)
except rfc3986.exceptions.RFC3986Exception:
return False
return True
def is_valid_domain(url_str):


+ 9
- 3
sysinv/sysinv/sysinv/sysinv/tests/test_utils.py View File

@ -326,9 +326,15 @@ class GenericUtilsTestCase(base.TestCase):
self.assertTrue(any(i in special_chars for i in passwd))
def test_generate_random_password_exception(self):
self.assertRaises(exception.SysinvException,
utils.generate_random_password,
length=7)
self.assertRaises(exception.SysinvException,
utils.generate_random_password,
length=7)
def test_is_valid_url(self):
self.assertTrue(utils.is_url('http://controller'))
self.assertTrue(utils.is_url('https://controller'))
self.assertFalse(utils.is_url('https://'))
self.assertFalse(utils.is_url('//controller'))
class MkfsTestCase(base.TestCase):


+ 0
- 8
sysinv/sysinv/sysinv/test-requirements.txt View File

@ -7,9 +7,6 @@ bandit;python_version>="3.0"
coverage>=3.6
fixtures>=3.0.0 # Apache-2.0/BSD
mock>=2.0.0 # BSD
passlib>=1.7.0
psycopg2-binary
python-barbicanclient
python-subunit>=0.0.18
requests-mock>=0.6.0 # Apache-2.0
sphinx
@ -21,8 +18,3 @@ testtools!=1.2.0,>=0.9.36
isort<5;python_version>="3.0"
pylint<2.1.0;python_version<"3.0" # GPLv2
pylint<2.4.0;python_version>="3.0" # GPLv2
pytest
pyudev
migrate
python-ldap>=3.1.0
markupsafe

Loading…
Cancel
Save