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
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The HEXRD project is developing a cross-platform, open-source library for the ge

# Installing

Requires Python 3.10+ (Python 3.11 recommended). It is generally recommended for interactive use to install `hexrd` into a fresh environment with Spyder and Jupyter as well. The GUI is in a separate package [here](https://github.com/hexrd/hexrdgui).
Requires Python 3.11+. It is generally recommended for interactive use to install `hexrd` into a fresh environment with Spyder and Jupyter as well. The GUI is in a separate package [here](https://github.com/hexrd/hexrdgui).

## conda (main releases)

Expand Down Expand Up @@ -62,7 +62,7 @@ See [Citing HEXRD](https://hexrdgui.readthedocs.io/en/latest/citing/#hexrd) for

# Development

Requires Python 3.10+ and a C compiler (_e.g._, `gcc` or VisualStudio). First clone the Git repository:
Requires Python 3.11+ and a C compiler (_e.g._, `gcc` or VisualStudio). First clone the Git repository:

```bash
git clone https://github.com/hexrd/hexrd.git
Expand All @@ -87,9 +87,9 @@ conda activate hexrd-dev
Now, install hexrd and its dependencies:

```bash
# First, make sure python3.10+ is installed in your target env.
# First, make sure python3.11+ is installed in your target env.
# If it is not, run the following command:
conda install -c conda-forge python=3.10
conda install -c conda-forge python=3.11

# Install deps using conda package
conda install -c hexrd/label/prerelease -c conda-forge hexrd
Expand Down
1 change: 0 additions & 1 deletion conda.recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
python:
- 3.10
- 3.11
- 3.12
- 3.13
Expand Down
9 changes: 9 additions & 0 deletions conda.recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ requirements:
run:
- appdirs
- chemparse
# Needed for the eiger-stream imageseries formats
- dectris-compression
- fabio >=0.11
# fabio uses lxml, and lxml 4.9.1 has some crashing issue on Windows
# so, make sure lxml >= 4.9.2 is being used
Expand All @@ -67,6 +69,13 @@ requirements:
test: # [build_platform == target_platform]
imports:
- hexrd
- hexrd.core.convolution.convolve
- hexrd.core.extensions.inverse_distortion
- hexrd.core.extensions.transforms
- hexrd.core.extensions.transforms_c_api
- hexrd.core.imageseries.load.eiger_stream_v2
commands:
- hexrd --help

about:
home: https://github.com/HEXRD/hexrd
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
install_reqs = [
'appdirs',
'chemparse',
'dectris-compression',
'fabio>=0.11',
'h5py',
'hdf5plugin',
Expand Down Expand Up @@ -200,7 +201,6 @@ def get_extension_modules():
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
'Programming Language :: Python :: 3.13',
Expand All @@ -211,6 +211,6 @@ def get_extension_modules():
packages=find_packages(),
include_package_data=True,
package_data={'': ['Anomalous.h5', 'file_table.tsv']},
python_requires='>=3.10',
python_requires='>=3.11',
install_requires=install_reqs,
)
Loading