Some Cleanups

This repo is now Python 3, update:
- Remove python 2.7 stanza from setup.py
- Remove install_command from tox.ini, the default is fine
- Remove Babel from requirements, it's not needed for running.
- Use TOX_CONSTRAINTS_FILE instead of obsolete UPPER_CONSTRAINTS_FILE.
- Use py36 for fault test

Change-Id: Ia23841a4899361178994e349e1323de857b4ee23
This commit is contained in:
Andreas Jaeger 2020-06-11 12:23:07 +02:00
parent a7de07ca4a
commit a39ed69ea0
5 changed files with 2 additions and 15 deletions

View File

@ -1,6 +1,6 @@
- job: - job:
name: castellan-functional-vault name: castellan-functional-vault
parent: openstack-tox-py27 parent: openstack-tox-py36
description: | description: |
Run tox functional-vault target Run tox functional-vault target
required-projects: required-projects:

View File

@ -1,6 +1,5 @@
appdirs==1.3.0 appdirs==1.3.0
asn1crypto==0.23.0 asn1crypto==0.23.0
Babel==2.3.4
certifi==2020.4.5.2 certifi==2020.4.5.2
cffi==1.13.2 cffi==1.13.2
chardet==3.0.4 chardet==3.0.4

View File

@ -3,7 +3,6 @@
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
pbr!=2.1.0,>=2.0.0 # Apache-2.0 pbr!=2.1.0,>=2.0.0 # Apache-2.0
Babel!=2.4.0,>=2.3.4 # BSD
cryptography>=2.1 # BSD/Apache-2.0 cryptography>=2.1 # BSD/Apache-2.0
python-barbicanclient>=4.5.2 # Apache-2.0 python-barbicanclient>=4.5.2 # Apache-2.0
oslo.config>=6.4.0 # Apache-2.0 oslo.config>=6.4.0 # Apache-2.0

View File

@ -13,17 +13,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
import setuptools 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( setuptools.setup(
setup_requires=['pbr>=2.0.0'], setup_requires=['pbr>=2.0.0'],
pbr=True) pbr=True)

View File

@ -11,7 +11,7 @@ setenv =
VIRTUAL_ENV={envdir} VIRTUAL_ENV={envdir}
OS_TEST_PATH=./castellan/tests/unit OS_TEST_PATH=./castellan/tests/unit
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -c{env:TOX_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs} commands = stestr run --slowest {posargs}
@ -78,7 +78,6 @@ commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasen
[testenv:functional] [testenv:functional]
usedevelop = True usedevelop = True
install_command = pip install -U {opts} {packages}
setenv = setenv =
VIRTUAL_ENV={envdir} VIRTUAL_ENV={envdir}
OS_TEST_PATH=./castellan/tests/functional OS_TEST_PATH=./castellan/tests/functional
@ -87,7 +86,6 @@ commands = stestr run --slowest {posargs}
[testenv:functional-vault] [testenv:functional-vault]
passenv = HOME passenv = HOME
usedevelop = True usedevelop = True
install_command = pip install -U {opts} {packages}
setenv = setenv =
VIRTUAL_ENV={envdir} VIRTUAL_ENV={envdir}
OS_TEST_PATH=./castellan/tests/functional OS_TEST_PATH=./castellan/tests/functional