From bd43b2dc16bb2217ea55add94ed8f6433b9a5b80 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Mon, 1 Apr 2019 17:03:13 +0100 Subject: [PATCH] Remove packaging This isn't distributed and can't be (there's not package to distribute). We can remove this. The Python-based zuul jobs are removed since there's no Python package here. Change-Id: Icff0aed6cd9f136ceefd6f8f0386cabe97bbf3fb Signed-off-by: Stephen Finucane --- .zuul.yaml | 4 ---- babel.cfg | 2 -- openstack-common.conf | 7 ------- requirements.txt | 5 ----- setup.cfg | 30 ------------------------------ setup.py | 29 ----------------------------- test-requirements.txt | 6 ------ tox.ini | 9 --------- 8 files changed, 92 deletions(-) delete mode 100644 babel.cfg delete mode 100644 openstack-common.conf delete mode 100644 requirements.txt delete mode 100644 setup.cfg delete mode 100644 setup.py delete mode 100644 test-requirements.txt diff --git a/.zuul.yaml b/.zuul.yaml index 3f7698a5..554a9f7c 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,8 +1,4 @@ - project: - templates: - - openstack-python-jobs - - openstack-python35-jobs - - openstack-python36-jobs check: jobs: - training-labs-scripts diff --git a/babel.cfg b/babel.cfg deleted file mode 100644 index 15cd6cb7..00000000 --- a/babel.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[python: **.py] - diff --git a/openstack-common.conf b/openstack-common.conf deleted file mode 100644 index 0841ba2c..00000000 --- a/openstack-common.conf +++ /dev/null @@ -1,7 +0,0 @@ -[DEFAULT] - -# The list of modules to copy from oslo-incubator.git - - -# The base module to hold the copy of openstack.common -base=labs diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index c3131f53..00000000 --- a/requirements.txt +++ /dev/null @@ -1,5 +0,0 @@ -# The order of packages is significant, because pip processes them in the order -# of appearance. Changing the order has an impact on the overall integration -# process, which may cause wedges in the gate later. - -pbr>=1.4 diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 36b6f4fa..00000000 --- a/setup.cfg +++ /dev/null @@ -1,30 +0,0 @@ -[metadata] -name = training-labs -summary = Automated OpenStack Deployments -description-files = - README.rst -author = OpenStack -author-email = openstack-discuss@lists.openstack.org -home-page = https://docs.openstack.org/training_labs/ -classifier = - Environment :: OpenStack - Intended Audience :: Information Technology - Intended Audience :: System Administrators - License :: OSI Approved :: Apache Software License - Operating System :: POSIX :: Linux - Programming Language :: Python - Programming Language :: Python :: 2 - Programming Language :: Python :: 2.7 - Programming Language :: Python :: 3 - Programming Language :: Python :: 3.3 - Programming Language :: Python :: 3.5 - -[files] -packages = - training-labs - -[pbr] -warnerrors = True - -[wheel] -universal = 1 diff --git a/setup.py b/setup.py deleted file mode 100644 index 056c16c2..00000000 --- a/setup.py +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2013 Hewlett-Packard Development Company, L.P. -# -# 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. - -# 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'], - pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt deleted file mode 100644 index af851bd8..00000000 --- a/test-requirements.txt +++ /dev/null @@ -1,6 +0,0 @@ -# The order of packages is significant, because pip processes them in the order -# of appreance. Changing the order has an impact on the overall integration -# process, which may cause wedges in the gate later. - -# For linting/profiling the code. -bashate # pep8 equivalent for bash scripts diff --git a/tox.ini b/tox.ini index 9b17ee41..b320f16f 100644 --- a/tox.ini +++ b/tox.ini @@ -21,24 +21,15 @@ setenv = OS_TEST_PATH=./training-labs/tests/ LANGUAGE=en_US LC_ALL=en_US.utf-8 -deps = - -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements.txt commands = find . -type f -name "*.pyc" -delete -[testenv:venv] -commands = {posargs} - [testenv:docs] deps = -r{toxinidir}/doc/requirements.txt commands = sphinx-build -W -b html -d doc/build/doctrees doc/source doc/build/html -[testenv:debug] -commands = oslo_debug_helper {posargs} - [testenv:bash8] # Filter the files and run bashate on required files. deps = bashate