Skip to content

Commit

Permalink
Merge pull request #131 from fiaas/py311
Browse files Browse the repository at this point in the history
Newer python.
  • Loading branch information
blockjesper authored May 2, 2024
2 parents 0769f4e + 7108a8f commit 3b8ce1e
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .semaphore/semaphore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ blocks:
- tox
matrix:
- env_var: TOXENV
values: ["py38", "py39"]
values: ["py39", "py310", "py311", "py312"]
- name: Gather coverage data
commands:
- CODACY_PROJECT_TOKEN=$CODACY_K8S_API_TOKEN tox -e coverage
Expand Down
2 changes: 1 addition & 1 deletion docs/requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
# When updating dependencies here:
# - Install pip-tools with `pip install pip-tools`
# - Use `pip-compile requirements.in` to update transitive dependency versions in requirements.txt
Sphinx==7.2.6
Sphinx==7.3.7
10 changes: 3 additions & 7 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#
# This file is autogenerated by pip-compile with Python 3.9
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile requirements.in
#
alabaster==0.7.13
alabaster==0.7.16
# via sphinx
babel==2.13.1
# via sphinx
Expand All @@ -18,8 +18,6 @@ idna==3.7
# via requests
imagesize==1.4.1
# via sphinx
importlib-metadata==6.8.0
# via sphinx
jinja2==3.1.3
# via sphinx
markupsafe==2.1.3
Expand All @@ -32,7 +30,7 @@ requests==2.31.0
# via sphinx
snowballstemmer==2.2.0
# via sphinx
sphinx==7.2.6
sphinx==7.3.7
# via
# -r requirements.in
# sphinxcontrib-applehelp
Expand All @@ -54,5 +52,3 @@ sphinxcontrib-serializinghtml==1.1.9
# via sphinx
urllib3==2.0.7
# via requests
zipp==3.17.0
# via importlib-metadata
23 changes: 13 additions & 10 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,22 @@
GENERIC_REQ = [
"requests==2.31.0",
"pyrfc3339==1.1",
"cachetools==3.1.1", # Newer versions require Python 3
"cachetools==5.3.3",
]

CODE_QUALITY_REQ = [
'prospector==1.2.0', # Newer versions require Python 3
'prospector==1.10.3',
'setuptools==69.5.1',
]

TESTS_REQ = [
'tox==3.24.5',
'mock==3.0.5', # Newer versions require Python 3
"pytest-sugar==0.9.4",
"pytest-html==1.22.0", # Newer versions require Python 3
"pytest-cov==2.7.1",
"pytest-helpers-namespace==2019.1.8",
'pytest==4.6.11', # Newer versions require Python 3
'tox==3.28.0', # This is not the latest version
'mock==5.1.0',
"pytest-sugar==1.0.0",
"pytest-html==4.1.1",
"pytest-cov==5.0.0",
"pytest-helpers-namespace==2021.12.29",
'pytest==8.1.1',
]


Expand Down Expand Up @@ -93,8 +94,10 @@ def main():
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Topic :: Internet",
"Topic :: Software Development :: Libraries :: Python Modules",
"Topic :: System :: Clustering",
Expand Down
2 changes: 1 addition & 1 deletion tests/k8s/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
from k8s import config


@pytest.yield_fixture
@pytest.fixture
def logger():
"""Set root logger to DEBUG, and add stream handler"""
root_logger = logging.getLogger()
Expand Down
2 changes: 1 addition & 1 deletion tests/k8s/test_job.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,4 @@ def _create_mock_response():


def _uri(namespace, name=""):
return "/apis/batch/v1/namespaces/{namespace}/jobs".format(name=name, namespace=namespace)
return "/apis/batch/v1/namespaces/{namespace}/jobs".format(namespace=namespace)
2 changes: 1 addition & 1 deletion tests/k8s/test_resourcequota.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,4 @@ def _create_default_resourcequota():


def _uri(namespace, name=""):
return "/api/v1/namespaces/{namespace}/resourcequotas".format(name=name, namespace=namespace)
return "/api/v1/namespaces/{namespace}/resourcequotas".format(namespace=namespace)
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py38,py39
envlist = py39,py310,py311,py312
requires = setuptools
virtualenv
skip_missing_interpreters=True
Expand Down

0 comments on commit 3b8ce1e

Please sign in to comment.