Skip to content

Commit

Permalink
Merge pull request #2158 from devitocodes/docker_python_38
Browse files Browse the repository at this point in the history
ci: Add python 3.11 and minor CI fixing
  • Loading branch information
mloubout authored Jul 20, 2023
2 parents 9466a03 + cfc2710 commit a4ea4a1
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 21 deletions.
1 change: 0 additions & 1 deletion .github/workflows/examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ jobs:
python examples/cfd/example_diffusion.py
- name: Upload coverage to Codecov
if: matrix.name != 'pytest-docker-py37-gcc-omp'
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/flake8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Set up Python 3.7
- name: Set up Python 3.9
uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: 3.9
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/pytest-core-nompi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ jobs:

matrix:
name: [
pytest-ubuntu-py39-gcc11-noomp,
pytest-ubuntu-py311-gcc11-noomp,
pytest-ubuntu-py38-gcc12-omp,
pytest-ubuntu-py39-gcc7-omp,
pytest-ubuntu-py37-gcc7-omp,
pytest-ubuntu-py310-gcc10-noomp,
pytest-ubuntu-py38-gcc8-omp,
pytest-ubuntu-py39-gcc9-omp,
Expand All @@ -42,8 +42,8 @@ jobs:
]
set: [base, adjoint]
include:
- name: pytest-ubuntu-py39-gcc11-noomp
python-version: '3.9'
- name: pytest-ubuntu-py311-gcc11-noomp
python-version: '3.11'
os: ubuntu-22.04
arch: "gcc-11"
language: "C"
Expand All @@ -56,8 +56,8 @@ jobs:
language: "openmp"
sympy: "1.10"

- name: pytest-ubuntu-py39-gcc7-omp
python-version: '3.9'
- name: pytest-ubuntu-py37-gcc7-omp
python-version: '3.7'
os: ubuntu-20.04
arch: "gcc-7"
language: "openmp"
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/tutorials.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,31 +22,31 @@ jobs:
env:
DEVITO_ARCH: "${{ matrix.compiler }}"
DEVITO_LANGUAGE: ${{ matrix.language }}
PYTHON_VERSION: "3.7"
PYTHON_VERSION: "3.9"

strategy:
# Prevent all build to stop if a single one fails
fail-fast: false
matrix:
name: [
tutos-ubuntu-gcc-py37,
tutos-osx-gcc-py37,
tutos-osx-clang-py37,
tutos-ubuntu-gcc-py39,
tutos-osx-gcc-py39,
tutos-osx-clang-py39,
tutos-docker-gcc-py39
]

include:
- name: tutos-ubuntu-gcc-py37
- name: tutos-ubuntu-gcc-py39
os: ubuntu-latest
compiler: gcc
language: "openmp"

- name: tutos-osx-gcc-py37
- name: tutos-osx-gcc-py39
os: macos-latest
compiler: gcc-11
language: "openmp"

- name: tutos-osx-clang-py37
- name: tutos-osx-clang-py39
os: macos-latest
compiler: clang
language: "C"
Expand All @@ -60,11 +60,11 @@ jobs:
- name: Checkout devito
uses: actions/checkout@v3

- name: Set up Python 3.7
- name: Set up Python 3.9
if: "!contains(matrix.name, 'docker')"
uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: 3.9

- uses: maxim-lobanov/setup-xcode@v1
if: runner.os == 'macOS'
Expand Down
4 changes: 2 additions & 2 deletions devito/tools/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,6 @@ def humanbytes(B):
elif MB <= B < GB:
return '%d MB' % round(B / MB)
elif GB <= B < TB:
return '%d GB' % round(B / GB)
return '%.1f GB' % round(B / GB, 1)
elif TB <= B:
return '%d TB' % round(B / TB)
return '%.2f TB' % round(B / TB, 1)
2 changes: 1 addition & 1 deletion versioneer.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* https://github.com/python-versioneer/python-versioneer
* Brian Warner
* License: Public Domain (CC0-1.0)
* Compatible with: Python 3.7, 3.8, 3.9, 3.10 and pypy3
* Compatible with: Python 3.7, 3.8, 3.9, 3.10, 3.11 and pypy3
* [![Latest Version][pypi-image]][pypi-url]
* [![Build Status][travis-image]][travis-url]
Expand Down

0 comments on commit a4ea4a1

Please sign in to comment.