From f0b82fca0f4a3551e7335d1a4a5c88e5beec3d0b Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Tue, 4 Apr 2023 15:29:01 +0200 Subject: [PATCH] Clean stage-archive.sh and use allowlist in tox.ini Change-Id: I15fd118f9198f165daf9bb56e5ff32fc1ac15dda Signed-off-by: garciadeblas --- devops-stages/stage-archive.sh | 46 +++++++++++++--------------------- tox.ini | 13 +++------- 2 files changed, 21 insertions(+), 38 deletions(-) diff --git a/devops-stages/stage-archive.sh b/devops-stages/stage-archive.sh index 1514025..d741a4c 100755 --- a/devops-stages/stage-archive.sh +++ b/devops-stages/stage-archive.sh @@ -1,34 +1,22 @@ -# Copyright 2017 Intel Research and Development Ireland Limited -# ************************************************************* - -# This file is part of OSM Monitoring module -# All Rights Reserved to Intel Corporation - -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at - -# http://www.apache.org/licenses/LICENSE-2.0 - -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -# For those usages not covered by the Apache License, Version 2.0 please -# contact: prithiv.mohan@intel.com or adrian.hoban@intel.com - -#__author__ = "Prithiv Mohan" -#__date__ = "25/Sep/2017" - - #!/bin/sh +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. +####################################################################################### rm -rf pool rm -rf dists mkdir -p pool/POL mv deb_dist/*.deb pool/POL/ -mkdir -p dists/unstable/POL/binary-amd64/ -apt-ftparchive packages pool/POL > dists/unstable/POL/binary-amd64/Packages -gzip -9fk dists/unstable/POL/binary-amd64/Packages -echo 'dists/**,pool/POL/*.deb' + diff --git a/tox.ini b/tox.ini index 87f7e21..90f35a8 100644 --- a/tox.ini +++ b/tox.ini @@ -37,12 +37,12 @@ commands = black --check --diff osm_policy_module/ black --check --diff setup.py - ####################################################################################### [testenv:cover] deps = {[testenv]deps} -r{toxinidir}/requirements-dev.txt -r{toxinidir}/requirements-test.txt +allowlist_externals = sh commands = sh -c 'rm -f nosetests.xml' coverage erase @@ -50,8 +50,6 @@ commands = coverage report --omit='*tests*' coverage html -d ./cover --omit='*tests*' coverage xml -o coverage.xml --omit=*tests* -whitelist_externals = sh - ####################################################################################### [testenv:flake8] @@ -59,7 +57,6 @@ deps = flake8 commands = flake8 osm_policy_module/ setup.py - ####################################################################################### [testenv:pylint] deps = {[testenv]deps} @@ -69,7 +66,6 @@ deps = {[testenv]deps} commands = - pylint -E osm_policy_module - ####################################################################################### [testenv:safety] setenv = @@ -80,12 +76,11 @@ deps = {[testenv]deps} commands = - safety check --full-report - ####################################################################################### [testenv:pip-compile] deps = pip-tools==6.6.2 skip_install = true -whitelist_externals = bash +allowlist_externals = bash [ commands = - bash -c "for file in requirements*.in ; do \ @@ -101,7 +96,7 @@ commands = [testenv:dist] deps = {[testenv]deps} -r{toxinidir}/requirements-dist.txt - +allowlist_externals = sh # In the commands, we copy the requirements.txt to be presented as a source file (.py) # so it gets included in the .deb package for others to consume commands = @@ -109,7 +104,7 @@ commands = python3 setup.py --command-packages=stdeb.command sdist_dsc sh -c 'cd deb_dist/osm-policy-module*/ && dpkg-buildpackage -rfakeroot -uc -us' sh -c 'rm osm_policy_module/requirements.txt' -whitelist_externals = sh + ####################################################################################### [flake8] -- 2.25.1