diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ff0441e5..a0770713 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,28 +9,39 @@ jobs: strategy: matrix: os: [macos-latest, ubuntu-latest, windows-latest] - python-version: ["3.7", "3.8", "3.9", "3.10"] + python-version: ["3.10", "3.11"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} + - name: Free Disk Space (Ubuntu) + if: ${{ matrix.os == 'ubuntu-latest' }} + uses: jlumbroso/free-disk-space@main + with: + haskell: false + large-packages: false + - name: setup apt dependencies for Linux if: ${{ matrix.os == 'ubuntu-latest' }} run: | - sudo apt-get update - sudo apt-get install opencl-headers ocl-icd-opencl-dev libpocl2 + wget https://repo.radeon.com/amdgpu-install/6.1.1/ubuntu/jammy/amdgpu-install_6.1.60101-1_all.deb + sudo apt install ./amdgpu-install_6.1.60101-1_all.deb + sudo apt update + sudo apt install amdgpu-dkms + sudo apt install rocm - name: Install Python dependencies run: | python -m pip install --upgrade pip python -m pip install wheel setuptools python -m pip install mako - python -m pip install numpy scipy matplotlib docutils pytest sphinx bumps unittest-xml-reporting tinycc + python -m pip install numpy==1.* + python -m pip install scipy matplotlib docutils pytest sphinx bumps unittest-xml-reporting tinycc - name: setup pyopencl on Linux + macOS if: ${{ matrix.os != 'windows-latest' }} diff --git a/CHANGES.rst b/CHANGES.rst index 74769dd6..4f628583 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,7 +1,13 @@ Release notes ============= -v1.0.7 2023-02-?? +v1.0.8 2024-06-?? +----------------- +* Doc update: Archive built docs on Github +* Doc update: Display math correctly +* Fix parameter name checking in kernel call + +v1.0.7 2023-03-23 ------------------ * Doc upate: corefunc and optimizer documentation * Doc update: various models (cylinder, gel_fit, paracrystal, core_shell_ellipsoid) diff --git a/LICENSE.txt b/LICENSE.txt index 5c5d397e..2843ab6b 100755 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,4 @@ -Copyright (c) 2009-2022, SasView Developers - +Copyright (c) 2009-2024, SasView Developers All rights reserved. diff --git a/doc/conf.py b/doc/conf.py index f699179b..9a041857 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -27,6 +27,7 @@ nitpick_ignore = [ ('py:class', 'argparse.Namespace'), + ('py:class', 'bumps.parameter.Parameter'), ('py:class', 'collections.OrderedDict'), ('py:class', 'cuda.Context'), ('py:class', 'cuda.Function'), @@ -40,6 +41,7 @@ ('py:class', 'pyopencl._cl.Device'), ('py:class', 'pyopencl._cl.Kernel'), ('py:class', 'QWebView'), + ('py:class', 'types.ModuleType'), ('py:class', 'unittest.suite.TestSuite'), ('py:class', 'wx.Frame'), # autodoc and namedtuple is completely broken @@ -55,6 +57,7 @@ ('py:class', 'module'), ('py:class', 'SesansData'), ('py:class', 'SourceModule'), + ('py:class', 'TestCondition'), # KernelModel and Calculator breaking on git actions tests, even though # KernelModel is already listed. astropy example sometimes includes full # path to complaining symbol. Let's see if that helps here: @@ -141,40 +144,6 @@ # A list of ignored prefixes for module index sorting. #modindex_common_prefix = [] -nitpick_ignore = [ - ('py:class', 'argparse.Namespace'), - ('py:class', 'bumps.parameter.Parameter'), - ('py:class', 'collections.OrderedDict'), - ('py:class', 'cuda.Context'), - ('py:class', 'cuda.Function'), - ('py:class', 'np.dtype'), - ('py:class', 'numpy.dtype'), - ('py:class', 'np.ndarray'), - ('py:class', 'numpy.ndarray'), - ('py:class', 'pyopencl.Program'), - ('py:class', 'pyopencl._cl.Context'), - ('py:class', 'pyopencl._cl.CommandQueue'), - ('py:class', 'pyopencl._cl.Device'), - ('py:class', 'pyopencl._cl.Kernel'), - ('py:class', 'QWebView'), - ('py:class', 'unittest.suite.TestSuite'), - ('py:class', 'wx.Frame'), - # autodoc and namedtuple is completely broken - ('py:class', 'integer -- return number of occurrences of value'), - ('py:class', 'integer -- return first index of value.'), - # autodoc doesn't handle these type definitions - ('py:class', 'Data'), - ('py:class', 'Data1D'), - ('py:class', 'Data2D'), - ('py:class', 'Kernel'), - ('py:class', 'ModelInfo'), - ('py:class', 'module'), - ('py:class', 'SesansData'), - ('py:class', 'SourceModule'), - ('py:class', 'TestCondition'), -] - - # -- Options for HTML output --------------------------------------------------- diff --git a/sasmodels/__init__.py b/sasmodels/__init__.py index 63319a54..dcb8de87 100644 --- a/sasmodels/__init__.py +++ b/sasmodels/__init__.py @@ -13,7 +13,7 @@ OpenCL drivers are available. See :mod:`.generate` for details on defining new models. """ -__version__ = "1.0.6" +__version__ = "1.0.8" def data_files(): """ diff --git a/setup.py b/setup.py index 89f3203b..33edf680 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ def find_version(package): return version[1:-1] raise RuntimeError("Could not read version from %s/__init__.py"%package) -install_requires = ['numpy', 'scipy'] +install_requires = ['numpy==1.*', 'scipy'] with open('README.rst') as fid: long_description = fid.read()