Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/publish_pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ jobs:
publish-to-pypi:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.11'
- name: Install build dependencies
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ jobs:
strategy:
matrix:
os: [ubuntu-20.04, ubuntu-latest]
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
exclude:
# Python 3.6 is not available in GitHub Actions Ubuntu 22.04
- os: ubuntu-latest
python-version: '3.6'
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
# See https://github.com/yaml/pyyaml/issues/601
Expand All @@ -25,6 +25,8 @@ jobs:
- name: Install package
run: PIP_CONSTRAINT=/tmp/constraint.txt python -m pip install .[dev]
- name: Linting
# Python 3.12 bug breaks flake8: https://github.com/PyCQA/flake8/issues/1905
if: matrix.python-version != '3.12'
run: "flake8"
- name: Unit tests
run: "pytest --cov"
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

### Unreleased

# v13.14.0
- Fix docker-compose conflict when kubetools commands are called without activating their venv
- Add Python 3.12 to supported versions, albeit without Flake8 because of CPython bug
- Upgrade GitHub actions workflow to deal with deprecation warnings

# v13.13.1
- Add nodeSelector config to kubetools file
- Fix bug where `config` command was not printing the actual `k8s` configs used by `deploy` because it did not take into account the kube-context, whether default or given with `--context`.
Expand Down
5 changes: 4 additions & 1 deletion kubetools/dev/backends/docker_compose/docker_util.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import sys

from functools import lru_cache

import docker
Expand Down Expand Up @@ -202,7 +204,8 @@ def run_compose_process(kubetools_config, command_args, **kwargs):
create_compose_config(kubetools_config)

compose_command = [
'docker-compose',
# Use current interpreter to run the docker-compose module installed in the same venv
sys.executable, '-m', 'compose',
# Force us to look at the current directory, not relative to the compose
# filename (ie .kubetools/compose-name.yml).
'--project-directory', '.',
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ def get_readme_content():
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
'Topic :: Software Development :: Build Tools',
'Topic :: Software Development :: Testing',
'Topic :: System :: Software Distribution',
Expand Down