From 0620f567c97b50ac7953740f9fe188116473b933 Mon Sep 17 00:00:00 2001 From: Christoph Hasse Date: Tue, 27 Feb 2024 00:08:45 -0500 Subject: [PATCH] Allow python >=3.7 & small plotting fix --- .github/workflows/regression.yml | 4 ++-- omas/omas_plot.py | 2 +- pyproject.toml | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index d76a2c25..a877160f 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -22,7 +22,7 @@ jobs: - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 with: - python-version: '3.8' + python-version: '3.7' - name: git version run: git --version @@ -43,5 +43,5 @@ jobs: run: | # TODO the tests pickup omas from the python files in the directory not the installed version # so to make that work we run an editable install to create the omas_cython lib in the right place. - python3 -m pip install -e . + python3 -m pip install -e make test diff --git a/omas/omas_plot.py b/omas/omas_plot.py index bba21fa1..9b35ff38 100644 --- a/omas/omas_plot.py +++ b/omas/omas_plot.py @@ -800,7 +800,7 @@ def get2d(contour_quantity): z = scipy.ndimage.zoom(z, sf) value_2d = scipy.ndimage.zoom(value_2d, sf) - cs = ax.contour(r, z, value_2d, levels, **kw) + cs = ax.contour(r, z, value_2d, levels=levels, **kw) if label_contours or ((label_contours is None) and (contour_quantity == 'q')): ax.clabel(cs) diff --git a/pyproject.toml b/pyproject.toml index db25f68e..0839e47b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,7 +30,7 @@ classifiers = [ ] keywords = ["integrated modeling", "OMFIT", "IMAS", "ITER"] -requires-python = '>=3.8' +requires-python = '>=3.7' dependencies = [ 'numpy>=1.16.1', 'uncertainties', @@ -44,7 +44,6 @@ dependencies = [ 'dnspython', 'xmltodict', 'xarray', - 'setuptools>=41.2', 'tqdm', ] readme="README.md"