Skip to content
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
3 changes: 3 additions & 0 deletions .github/workflows/smoke_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,6 @@ jobs:
# run install to see if it works
- name: Build
run: pixi run --manifest-path pixi/pixi.toml -e ${{ matrix.env }} install${{ matrix.os.cmd_extra }}

- name: test
run: pixi run --manifest-path pixi/pixi.toml -e ${{ matrix.env }} test
15 changes: 15 additions & 0 deletions GSASII/inputs/meson.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
foreach file: ['DefaultExpressions.txt', 'OriginTemplate2.otpu', 'versioninfo.txt', 'Xsect.dat']

install_data(
file,
install_tag: 'data',
install_dir: py.get_install_dir(subdir: 'GSASII/inputs')
)

endforeach

install_subdir(
'GSASIImacros',
install_tag: 'data',
install_dir: py.get_install_dir(subdir: 'GSASII/inputs')
)
1 change: 1 addition & 0 deletions GSASII/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,4 @@ subdir('NIST_profile')
subdir('imports')
subdir('exports')
subdir('icons')
subdir('inputs')
103 changes: 103 additions & 0 deletions pixi/pixi.lock

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions pixi/pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ install-editable-win = { cmd = "pip install -ve . --no-build-isolation" , cwd='
build-and-go ={ depends_on= ["install", "ui"]}
build-and-go-win ={ depends_on= ["install-win", "ui"]}

test = {cmd = "python -m pytest ../" }

ui = "python -m GSASII"


Expand Down Expand Up @@ -54,6 +56,7 @@ xmltodict = ">=0.14.2,<0.15"
compilers = ">=1.8.0,<2"
clang = ">=17.0.6,<20"
pycifrw = ">=4.4.0"
pytest = ">=8.3.4,<9"

[feature.py311.dependencies]
python = "<3.12,>=3.11"
Expand Down
7 changes: 3 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ authors = [
description = "Structural analysis from neutron and x-ray diffraction"
readme = "README.md"
license.file = "LICENSE"
requires-python = ">=3.9"
requires-python = ">=3.10"
classifiers = [
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Science/Research",
Expand All @@ -29,12 +29,11 @@ classifiers = [
"Programming Language :: Fortran",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12", # in progress
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Topic :: Scientific/Engineering",
"Typing :: Typed",
]
keywords = ["diffraction", "crystallography", "diffraction",
"powder diffraction", "SAXS", "reflectometry","neutron diffraction", "Rietveld"]
Expand Down
5 changes: 5 additions & 0 deletions tests/test_elm.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
from GSASII import GSASIIElem

def test_get_xsection():
xsection = GSASIIElem.GetXsectionCoeff('Fe')
assert len(xsection) > 0