Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.0.8 - merge into master #600

Merged
merged 20 commits into from
Jul 15, 2024
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
23 changes: 17 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
Expand Down
8 changes: 7 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
3 changes: 1 addition & 2 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
Copyright (c) 2009-2022, SasView Developers

Copyright (c) 2009-2024, SasView Developers

All rights reserved.

Expand Down
37 changes: 3 additions & 34 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand All @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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 ---------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion sasmodels/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
"""
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Loading