From a09d09c77c2a61ef64dba1a0885617e921740033 Mon Sep 17 00:00:00 2001
From: Benjamen Meyer <bm_witness@yahoo.com>
Date: Sun, 11 Feb 2024 00:26:47 -0500
Subject: [PATCH 1/3] Updates: 2024-02

- Upgrade to latest version of Stack-In-A-Box
- Move from nosetests to pytest
- Update supported versions of Python
---
 setup.py                    |  2 +-
 tools/test-requirements.txt |  6 +++---
 tox.ini                     | 16 ++++++++--------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/setup.py b/setup.py
index c87b6cd..b3cbae8 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-REQUIRES = ['stackinabox>=0.12', 'six']
+REQUIRES = ['stackinabox>=0.13', 'six']
 
 setup(
     name='openstackinabox',
diff --git a/tools/test-requirements.txt b/tools/test-requirements.txt
index 2f02095..f0e6153 100644
--- a/tools/test-requirements.txt
+++ b/tools/test-requirements.txt
@@ -1,9 +1,9 @@
 coverage
 ddt
 mock
-nose
-nose-exclude
-pep8
+pytest
+pytest-cov
+pycodestyle
 requests
 requests-mock
 six
diff --git a/tox.ini b/tox.ini
index d0f6103..909d7d9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,25 +1,25 @@
 [tox]
 minversion=1.8
-envlist = {py3.6,py3.7,py3.8,py3.9},pep8,flake8
+envlist = {py3.8,py3.9,py3.10,py3.11,py3.12},pep8,flake8
 skip_missing_interpreters=True
 
 [testenv]
 basepython =
-    py27: python2.7
     pypy: pypy
     pypy3: pypy3
-    py34: python3.4
-    py35: python3.5
-    py3.6: python3.6
-    py3.7: python3.7
     py3.8: python3.8
     py3.9: python3.9
+    py3.10: python3.10
+    py3.11: python3.11
+    py3.12: python3.12
     pep8: python3
     flake8: python3
 deps =
-    py27,pypy,pypy3,py34,py35,py3.6,py3.7,py3.8,py3.9: -r{toxinidir}/tools/test-requirements.txt
+    pypy,pypy3,py3.8,py3.9,py3.10,py3.11,py3.12: -r{toxinidir}/tools/test-requirements.txt
     pep8,flake8: -r{toxinidir}/tools/lint-requirements.txt
 commands =
-    py27,pypy,pypy3,py34,py35,py3.6,py3.7,py3.8,py3.9: nosetests {posargs}
+    pypy,pypy3py3.8,py3.9,py3.10,py3.11,py3.12: pytest --cov-config=.coveragerc --cov=openstackinabox {posargs}
     pep8: pycodestyle --exclude=.tox,dist,doc,*env*,.*env*,build --ignore=E128,W504
     flake8: flake8 openstackinabox/ setup.py
+setenv =
+    pypy,pypy3,py3.8,py3.9,py3.10,py3.11,py3.12,pep8,flake8: VIRTUAL_ENV={envdir} LC_ALL = en.US.utf-8

From 1e211cc25c886a30a56eca6bd811208faa3c158e Mon Sep 17 00:00:00 2001
From: Benjamen Meyer <bm_witness@yahoo.com>
Date: Sun, 11 Feb 2024 00:36:34 -0500
Subject: [PATCH 2/3] Refactor: setup.py

Convert setup.py to the newer format with data stored in setup.cfg
---
 setup.cfg | 27 +++++++++++++++++++++++++++
 setup.py  | 21 ++-------------------
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index e0eeaf4..5cc01d7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,3 +7,30 @@ cover-erase=1
 cover-inclusive=true
 cover-branches=true
 cover-min-percentage=30
+
+[metadata]
+name = openstackinabox
+url = https://github.com/TestInABox/openstackinabox
+version = attr: openstackinabox.version
+author = Benjamen R. Meyer
+author_email = bm_witness@yahoo.com
+description = OpenStack APIs for the Stack-In-A-Box Testing Suite
+long_description = file: README.rst
+long_description_content_type = text/x-rst
+license = Apache License 2.0
+classifiers =
+    Intended Audience :: Developers
+    License :: OSI Approved :: Apache Software License
+    Topic :: Software Development :: Testing
+
+[options]
+zip_safe = True
+packages = find:
+install_requires =
+    six
+    stackinabox>=0.13
+
+[options.packages.find]
+exclude =
+    tests*
+    openstackinabox/tests
diff --git a/setup.py b/setup.py
index b3cbae8..6068493 100644
--- a/setup.py
+++ b/setup.py
@@ -1,20 +1,3 @@
-from setuptools import setup, find_packages
+from setuptools import setup
 
-REQUIRES = ['stackinabox>=0.13', 'six']
-
-setup(
-    name='openstackinabox',
-    version='0.1',
-    description='RESTful API Testing Suite',
-    license='Apache License 2.0',
-    url='https://github.com/TestInABox/openstackinabox',
-    author='Benjamen R. Meyer',
-    author_email='ben.meyer@rackspace.com',
-    install_requires=REQUIRES,
-    test_suite='openstackinabox',
-    packages=find_packages(exclude=['tests*', 'openstackinabox/tests']),
-    zip_safe=True,
-    classifiers=["Intended Audience :: Developers",
-                 "License :: OSI Approved :: MIT License",
-                 "Topic :: Software Development :: Testing"],
-)
+setup()

From 17f1b1fa3573ac789a85265323fcc8027e7ec4af Mon Sep 17 00:00:00 2001
From: Benjamen Meyer <bm_witness@yahoo.com>
Date: Sun, 11 Feb 2024 00:38:16 -0500
Subject: [PATCH 3/3] Update: CI config

---
 .github/workflows/ci-gh-actions.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-gh-actions.yml b/.github/workflows/ci-gh-actions.yml
index 7e094b6..9e14011 100644
--- a/.github/workflows/ci-gh-actions.yml
+++ b/.github/workflows/ci-gh-actions.yml
@@ -8,7 +8,7 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                python-version: [3.9]
+                python-version: [3.12]
         steps:
             - uses: actions/checkout@v2
               with:
@@ -29,7 +29,7 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                python-version: [3.6, 3.7, 3.8, 3.9]
+                python-version: [3.8, 3.9, 3.10.13, 3.11, 3.12]
         steps:
             - uses: actions/checkout@v2
               with: