diff --git a/.github/dummy b/.github/dummy new file mode 100755 index 00000000..e69de29b diff --git a/.github/workflows/buildcheck.yml b/.github/workflows/buildcheck.yml index 382baab6..6af9afad 100644 --- a/.github/workflows/buildcheck.yml +++ b/.github/workflows/buildcheck.yml @@ -4,13 +4,21 @@ on: [push, pull_request] jobs: mixed_tests: runs-on: ubuntu-22.04 + strategy: + matrix: + python-version: + - '3.8.x' + - '3.11.x' + - '3.12.x' + - 'pypy3.10' + steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: - python-version: 3.10.x + python-version: ${{ matrix.python-version }} - name: Install dependencies run: | diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine index 4fef8b37..e2f6db89 100644 --- a/docker/Dockerfile.alpine +++ b/docker/Dockerfile.alpine @@ -6,7 +6,7 @@ # Official python image has an alpine-based version. It's easiest to # use it directly instead of building from source with pyenv. -FROM python:3.11-alpine +FROM python:3.12-alpine # Install extras RUN apk add sudo bash diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu index 980ed465..f60337ef 100644 --- a/docker/Dockerfile.ubuntu +++ b/docker/Dockerfile.ubuntu @@ -19,8 +19,8 @@ WORKDIR /ifex USER ubuntu ENV PATH "/home/ubuntu/.pyenv/bin:/usr/bin:/bin" RUN scripts/install_pyenv.sh -RUN scripts/install_python_version_in_pyenv.sh 3.11 -RUN pyenv global 3.11 +RUN scripts/install_python_version_in_pyenv.sh 3.12 +RUN pyenv global 3.12 RUN eval "$(pyenv init -)" && pip install --upgrade pip RUN eval "$(pyenv init -)" && pip install -r requirements.txt RUN eval "$(pyenv init -)" && python setup.py develop diff --git a/requirements.txt b/requirements.txt index 710fa970..2d963f9f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,3 +14,5 @@ six==1.16.0 tomli==2.0.1 dacite==1.6.0 jsonschema>=4.20 +lark==1.1.9 +setuptools diff --git a/setup.py b/setup.py index 1e434dda..177c8026 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,7 @@ #!/usr/bin/env python -from distutils import extension import glob -from distutils.core import setup +from setuptools import setup from setuptools import find_packages from ifex.templates import TemplateDir