Browse Source

Cleanup py27 support

Make a few cleanups:
- Remove python 2.7 stanza from setup.py
- Add requires on python >= 3.6 to setup.cfg so that pypi and pip
  know about the requirement
- Remove obsolete sections from setup.cfg
- Update classifiers
- Update requirements, no need for python_version anymore

Drop rocky and queens jobs, those jobs are py27 and are not
supported here anymore.

Change-Id: I2e797d325c9427264ef3dbba7aca15936eb65cd1
changes/80/717480/5
Andreas Jaeger 1 year ago
committed by Andreas Jaeger
parent
commit
3042a3cac8
4 changed files with 4 additions and 72 deletions
  1. +0
    -48
      .zuul.yaml
  2. +1
    -2
      doc/requirements.txt
  3. +3
    -13
      setup.cfg
  4. +0
    -9
      setup.py

+ 0
- 48
.zuul.yaml View File

@ -10,8 +10,6 @@
- python-tempestconf-tempest-devstack-admin
- python-tempestconf-tempest-devstack-admin-train
- python-tempestconf-tempest-devstack-admin-stein
- python-tempestconf-tempest-devstack-admin-rocky
- python-tempestconf-tempest-devstack-admin-queens
- python-tempestconf-tempest-devstack-demo
- python-tempestconf-tempest-packstack-admin
- python-tempestconf-tempest-packstack-demo
@ -24,8 +22,6 @@
- python-tempestconf-tempest-devstack-admin
- python-tempestconf-tempest-devstack-admin-train
- python-tempestconf-tempest-devstack-admin-stein
- python-tempestconf-tempest-devstack-admin-rocky
- python-tempestconf-tempest-devstack-admin-queens
- python-tempestconf-tempest-devstack-demo
- python-tempestconf-tempest-packstack-admin
- python-tempestconf-tempest-packstack-demo
@ -37,8 +33,6 @@
jobs:
- python-tempestconf-tempest-devstack-demo-train
- python-tempestconf-tempest-devstack-demo-stein
- python-tempestconf-tempest-devstack-demo-rocky
- python-tempestconf-tempest-devstack-demo-queens
- job:
@ -170,27 +164,6 @@
vars:
branch: stable/stein
- job:
name: python-tempestconf-tempest-devstack-admin-rocky
parent: python-tempestconf-tempest-devstack-admin
override-checkout: stable/rocky
vars:
branch: stable/rocky
- job:
name: python-tempestconf-tempest-devstack-admin-queens
parent: python-tempestconf-tempest-devstack-admin
override-checkout: stable/queens
vars:
branch: stable/queens
devstack_services:
<<: *devstack_services
# disable Swift services
s-account: false
s-container: false
s-object: false
s-proxy: false
- job:
name: python-tempestconf-tempest-devstack-demo
parent: python-tempestconf-devstack-base
@ -224,27 +197,6 @@
vars:
branch: stable/stein
- job:
name: python-tempestconf-tempest-devstack-demo-rocky
parent: python-tempestconf-tempest-devstack-demo
override-checkout: stable/rocky
vars:
branch: stable/rocky
- job:
name: python-tempestconf-tempest-devstack-demo-queens
parent: python-tempestconf-tempest-devstack-demo
override-checkout: stable/queens
vars:
branch: stable/queens
devstack_services:
<<: *devstack_services
# disable Swift services
s-account: false
s-container: false
s-object: false
s-proxy: false
- job:
name: python-tempestconf-tempest-packstack-admin
parent: python-tempestconf-packstack-base


+ 1
- 2
doc/requirements.txt View File

@ -1,5 +1,4 @@
openstackdocstheme>=1.20.0 # Apache-2.0
reno>=1.8.0 # Apache-2.0
sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD
sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD
sphinx-argparse>=0.2.2 # MIT

+ 3
- 13
setup.cfg View File

@ -6,6 +6,7 @@ description-file =
author = OpenStack
author-email = openstack-discuss@lists.openstack.org
home-page = https://pypi.org/project/python-tempestconf
python-requires = >=3.6
classifier =
Environment :: OpenStack
Intended Audience :: Information Technology
@ -13,6 +14,8 @@ classifier =
License :: OSI Approved :: Apache Software License
Operating System :: POSIX :: Linux
Programming Language :: Python
Programming Language :: Python :: Implementation :: CPython
Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
@ -23,16 +26,3 @@ packages =
[entry_points]
console_scripts =
discover-tempest-config = config_tempest.main:main
[build_sphinx]
source-dir = doc/source
build-dir = doc/build
all_files = 1
[upload_sphinx]
upload-dir = doc/build/html
[build_releasenotes]
all_files = 1
build-dir = releasenotes/build
source-dir = releasenotes/source

+ 0
- 9
setup.py View File

@ -13,17 +13,8 @@
# 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>=1.8'],
pbr=True)

Loading…
Cancel
Save