From a91e2254326f90c082106fa9f27b3e08f06ec288 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Tue, 18 Apr 2023 16:04:20 +0200 Subject: [PATCH] Clean stage-archive.sh and use allowlist_extenals in tox.ini Change-Id: I3a09df53487b8dd3c30bed8036647633dfe010d6 Signed-off-by: garciadeblas --- devops-stages/stage-archive.sh | 22 ++++++++++++++++------ tox.ini | 6 +++--- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/devops-stages/stage-archive.sh b/devops-stages/stage-archive.sh index 98b44a3..a64b87b 100755 --- a/devops-stages/stage-archive.sh +++ b/devops-stages/stage-archive.sh @@ -1,14 +1,24 @@ #!/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. +####################################################################################### MDG=IM - rm -rf pool rm -rf dists mkdir -p pool/$MDG mv deb_dist/*.deb pool/$MDG/ mv *.deb pool/$MDG/ -mv pyangbind/deb_dist/*.deb pool/$MDG/ -mv pyang/deb_dist/*.deb pool/$MDG/ -mkdir -p dists/unstable/$MDG/binary-amd64/ -apt-ftparchive packages pool/$MDG > dists/unstable/$MDG/binary-amd64/Packages -gzip -9fk dists/unstable/$MDG/binary-amd64/Packages diff --git a/tox.ini b/tox.ini index 4a2494a..1e93fb3 100644 --- a/tox.ini +++ b/tox.ini @@ -50,7 +50,7 @@ commands = coverage report --omit='*tests*' coverage html -d ./cover --omit='*tests*' coverage xml -o coverage.xml --omit=*tests* -whitelist_externals = sh +allowlist_externals = sh ####################################################################################### @@ -78,7 +78,7 @@ commands = [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 \ @@ -104,7 +104,7 @@ commands = python3 setup.py --command-packages=stdeb.command sdist_dsc sh -c 'cd deb_dist/osm-im*/ && dpkg-buildpackage -rfakeroot -uc -us' sh -c 'rm osm_im/requirements.txt' -whitelist_externals = sh +allowlist_externals = sh ####################################################################################### [flake8] -- 2.17.1