Skip to content

Commit 4a918a2

Browse files
committed
release 1.6.1
1 parent eb45e11 commit 4a918a2

File tree

5 files changed

+38
-42
lines changed

5 files changed

+38
-42
lines changed

PKG-INFO

+21-18
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Metadata-Version: 2.1
22
Name: xrt
3-
Version: 1.6.0
3+
Version: 1.6.1
44
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.
55
Home-page: http://xrt.readthedocs.io
66
Author: Konstantin Klementiev, Roman Chernikov
@@ -18,6 +18,19 @@ Classifier: Topic :: Scientific/Engineering :: Physics
1818
Classifier: Topic :: Scientific/Engineering :: Visualization
1919
Description-Content-Type: text/x-rst
2020
License-File: LICENSE.txt
21+
Requires-Dist: numpy>=1.8.0
22+
Requires-Dist: scipy>=0.17.0
23+
Requires-Dist: matplotlib>=2.0.0
24+
Requires-Dist: sphinx>=1.6.2
25+
Requires-Dist: sphinxcontrib-jquery
26+
Requires-Dist: distro
27+
Requires-Dist: colorama
28+
Requires-Dist: pyopencl
29+
Requires-Dist: pyopengl
30+
Requires-Dist: siphash24
31+
Provides-Extra: pyqt5
32+
Requires-Dist: pyqt5; extra == "pyqt5"
33+
Requires-Dist: PyQtWebEngine; extra == "pyqt5"
2134

2235

2336
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
159172
given the fact that xrtQook can automatically calculate several positional and
160173
angular parameters.
161174

162-
Dependencies
175+
Installation
163176
------------
164177

165-
numpy, scipy and matplotlib are required. If you use OpenCL for calculations on
166-
GPU or CPU, you need AMD/NVIDIA drivers, ``Intel CPU only OpenCL runtime``
167-
(these are search key words), pytools and pyopencl. PyQt4 or PyQt5 are needed
168-
for xrtQook. Spyder (as library of Spyder IDE) is highly recommended for nicer
169-
view of xrtQook. OpenGL is required for xrtGlow.
178+
Install it by pip or conda or get xrt from `GitHub` and use it with or without
179+
installation.
170180

171-
Get xrt
172-
-------
173-
174-
xrt is available as source distribution from `pypi.python.org
175-
<https://pypi.python.org/pypi/xrt>`_ and from `GitHub
176-
<https://github.com/kklmn/xrt>`_. The distribution archive also includes tests
177-
and examples. The complete documentation is available online at
178-
`Read the Docs <http://xrt.readthedocs.io>`_ and offline as
179-
`zip file at GitHub <https://github.com/kklmn/xrt-docs>`_.
181+
The distribution archive also includes tests and examples. The complete
182+
documentation is available online on `Read the Docs` and offline as zip file on
183+
GitHub`.
180184

181185
Get help
182186
--------
183187

184-
For getting help and/or reporting a bug please use `GitHub xrt Issues
185-
<https://github.com/kklmn/xrt/issues>`_.
188+
For getting help and/or reporting a bug please use `GitHub xrt Issues`.
186189

doc/conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,9 @@ def sort_crystals(method):
167167
# built documents.
168168
#
169169
# The short X.Y version.
170-
version = '1.6.0'
170+
version = '1.6.1'
171171
# The full version, including alpha/beta/rc tags.
172-
release = '1.6.0'
172+
release = '1.6.1'
173173

174174
# The language for content autogenerated by Sphinx. Refer to documentation
175175
# for a list of supported languages.

doc/history.rst

+5-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,15 @@ Version history
44
---------------
55

66
Current GitHub code:
7+
--
8+
9+
1.6.1 (13 Nov 2024):
710
- Minor bug fixes.
811

912
- Enable custom materials in xrtQook.
1013

11-
- Add hyperbolic (HyperbolicMirrorParam) and hyperboloid
12-
(HyperboloidCapillaryMirror) mirrors with focusing test scripts
14+
- Add hyperbolic (oes.HyperbolicMirrorParam) and hyperboloid
15+
(oes.HyperboloidCapillaryMirror) mirrors with focusing test scripts
1316
`test_param_mirror.py` and `test_hyperboloid_tube_mirror.py`.
1417

1518
- Add an example for applying a slope error map to a parametric mirror

setup.py

+8-18
Original file line numberDiff line numberDiff line change
@@ -143,36 +143,26 @@
143143
given the fact that xrtQook can automatically calculate several positional and
144144
angular parameters.
145145
146-
Dependencies
146+
Installation
147147
------------
148148
149-
numpy, scipy and matplotlib are required. If you use OpenCL for calculations on
150-
GPU or CPU, you need AMD/NVIDIA drivers, ``Intel CPU only OpenCL runtime``
151-
(these are search key words), pytools and pyopencl. PyQt4 or PyQt5 are needed
152-
for xrtQook. Spyder (as library of Spyder IDE) is highly recommended for nicer
153-
view of xrtQook. OpenGL is required for xrtGlow.
149+
Install it by pip or conda or get xrt from `GitHub` and use it with or without
150+
installation.
154151
155-
Get xrt
156-
-------
157-
158-
xrt is available as source distribution from `pypi.python.org
159-
<https://pypi.python.org/pypi/xrt>`_ and from `GitHub
160-
<https://github.com/kklmn/xrt>`_. The distribution archive also includes tests
161-
and examples. The complete documentation is available online on
162-
`Read the Docs <http://xrt.readthedocs.io>`_ and offline as
163-
`zip file on GitHub <https://github.com/kklmn/xrt-docs>`_.
152+
The distribution archive also includes tests and examples. The complete
153+
documentation is available online on `Read the Docs` and offline as zip file on
154+
GitHub`.
164155
165156
Get help
166157
--------
167158
168-
For getting help and/or reporting a bug please use `GitHub xrt Issues
169-
<https://github.com/kklmn/xrt/issues>`_.
159+
For getting help and/or reporting a bug please use `GitHub xrt Issues`.
170160
171161
"""
172162

173163
setup(
174164
name='xrt',
175-
version='1.6.0',
165+
version='1.6.1',
176166
description='Ray tracing and wave propagation in x-ray regime, primarily '
177167
'meant for modeling synchrotron sources, beamlines and '
178168
'beamline elements. Includes a GUI for creating a beamline '

xrt/version.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# -*- coding: utf-8 -*-
2-
__versioninfo__ = (1, 6, 0)
2+
__versioninfo__ = (1, 6, 1)
33
__version__ = '.'.join(map(str, __versioninfo__))
4-
__date__ = "17 Jul 2023"
4+
__date__ = "13 Nov 2024"

0 commit comments

Comments
 (0)