diff --git a/PKG-INFO b/PKG-INFO index cd92492..e11c5df 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: xrt -Version: 1.6.0 +Version: 1.6.1 Summary: Ray tracing and wave propagation in x-ray regime, primarily meant for modeling synchrotron sources, beamlines and beamline elements. Includes a GUI for creating a beamline and viewing it in 3D. Home-page: http://xrt.readthedocs.io Author: Konstantin Klementiev, Roman Chernikov @@ -18,6 +18,19 @@ Classifier: Topic :: Scientific/Engineering :: Physics Classifier: Topic :: Scientific/Engineering :: Visualization Description-Content-Type: text/x-rst License-File: LICENSE.txt +Requires-Dist: numpy>=1.8.0 +Requires-Dist: scipy>=0.17.0 +Requires-Dist: matplotlib>=2.0.0 +Requires-Dist: sphinx>=1.6.2 +Requires-Dist: sphinxcontrib-jquery +Requires-Dist: distro +Requires-Dist: colorama +Requires-Dist: pyopencl +Requires-Dist: pyopengl +Requires-Dist: siphash24 +Provides-Extra: pyqt5 +Requires-Dist: pyqt5; extra == "pyqt5" +Requires-Dist: PyQtWebEngine; extra == "pyqt5" Package xrt is a python software library for ray tracing and wave propagation @@ -159,28 +172,18 @@ The primary purpose of xrtGlow is to demonstrate the alignment correctness given the fact that xrtQook can automatically calculate several positional and angular parameters. -Dependencies +Installation ------------ -numpy, scipy and matplotlib are required. If you use OpenCL for calculations on -GPU or CPU, you need AMD/NVIDIA drivers, ``Intel CPU only OpenCL runtime`` -(these are search key words), pytools and pyopencl. PyQt4 or PyQt5 are needed -for xrtQook. Spyder (as library of Spyder IDE) is highly recommended for nicer -view of xrtQook. OpenGL is required for xrtGlow. +Install it by pip or conda or get xrt from `GitHub` and use it with or without +installation. -Get xrt -------- - -xrt is available as source distribution from `pypi.python.org -`_ and from `GitHub -`_. The distribution archive also includes tests -and examples. The complete documentation is available online at -`Read the Docs `_ and offline as -`zip file at GitHub `_. +The distribution archive also includes tests and examples. The complete +documentation is available online on `Read the Docs` and offline as zip file on +GitHub`. Get help -------- -For getting help and/or reporting a bug please use `GitHub xrt Issues -`_. +For getting help and/or reporting a bug please use `GitHub xrt Issues`. diff --git a/doc/conf.py b/doc/conf.py index 7f027f3..979a7ae 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -167,9 +167,9 @@ def sort_crystals(method): # built documents. # # The short X.Y version. -version = '1.6.0' +version = '1.6.1' # The full version, including alpha/beta/rc tags. -release = '1.6.0' +release = '1.6.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/history.rst b/doc/history.rst index aaf128b..a2c8bda 100644 --- a/doc/history.rst +++ b/doc/history.rst @@ -4,12 +4,15 @@ Version history --------------- Current GitHub code: + -- + +1.6.1 (13 Nov 2024): - Minor bug fixes. - Enable custom materials in xrtQook. - - Add hyperbolic (HyperbolicMirrorParam) and hyperboloid - (HyperboloidCapillaryMirror) mirrors with focusing test scripts + - Add hyperbolic (oes.HyperbolicMirrorParam) and hyperboloid + (oes.HyperboloidCapillaryMirror) mirrors with focusing test scripts `test_param_mirror.py` and `test_hyperboloid_tube_mirror.py`. - Add an example for applying a slope error map to a parametric mirror diff --git a/setup.py b/setup.py index d3f25bd..572bc63 100644 --- a/setup.py +++ b/setup.py @@ -143,36 +143,26 @@ given the fact that xrtQook can automatically calculate several positional and angular parameters. -Dependencies +Installation ------------ -numpy, scipy and matplotlib are required. If you use OpenCL for calculations on -GPU or CPU, you need AMD/NVIDIA drivers, ``Intel CPU only OpenCL runtime`` -(these are search key words), pytools and pyopencl. PyQt4 or PyQt5 are needed -for xrtQook. Spyder (as library of Spyder IDE) is highly recommended for nicer -view of xrtQook. OpenGL is required for xrtGlow. +Install it by pip or conda or get xrt from `GitHub` and use it with or without +installation. -Get xrt -------- - -xrt is available as source distribution from `pypi.python.org -`_ and from `GitHub -`_. The distribution archive also includes tests -and examples. The complete documentation is available online on -`Read the Docs `_ and offline as -`zip file on GitHub `_. +The distribution archive also includes tests and examples. The complete +documentation is available online on `Read the Docs` and offline as zip file on +GitHub`. Get help -------- -For getting help and/or reporting a bug please use `GitHub xrt Issues -`_. +For getting help and/or reporting a bug please use `GitHub xrt Issues`. """ setup( name='xrt', - version='1.6.0', + version='1.6.1', description='Ray tracing and wave propagation in x-ray regime, primarily ' 'meant for modeling synchrotron sources, beamlines and ' 'beamline elements. Includes a GUI for creating a beamline ' diff --git a/xrt/version.py b/xrt/version.py index afff6a6..8ed47b0 100644 --- a/xrt/version.py +++ b/xrt/version.py @@ -1,4 +1,4 @@ # -*- coding: utf-8 -*- -__versioninfo__ = (1, 6, 0) +__versioninfo__ = (1, 6, 1) __version__ = '.'.join(map(str, __versioninfo__)) -__date__ = "17 Jul 2023" +__date__ = "13 Nov 2024"