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/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ jobs:
# Use libmamba as the solver for all future conda commands
export CONDA_SOLVER=libmamba

# Specify the Python version in the package here
export CONDA_PY=314

HEXRD_PACKAGE_CHANNEL=${HEXRD_PACKAGE_CHANNEL} HEXRDGUI_OUTPUT_FOLDER=output/ cpack
# This is need to ensure ~/.profile or ~/.bashrc are used so the activate
# command works.
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ jobs:
strategy:
fail-fast: true
matrix:
python-version: ['3.11']
python-version: ['3.11', '3.14']
config:
- {
name: "Linux",
os: ubuntu-latest
}
- {
name: "MacOSX",
os: macos-15
os: macos-latest
}
- {
name: "Windows",
Expand Down Expand Up @@ -59,10 +59,6 @@ jobs:
if: ${{ matrix.config.name == 'Linux' }}
run: sudo apt-get update && sudo apt-get install -y libegl1-mesa-dev

- name: Set environment variable to work around setuptools/numpy issue
run: echo 'SETUPTOOLS_USE_DISTUTILS=stdlib' >> $GITHUB_ENV
if: ${{ matrix.config.name == 'Windows' }}

- name: Install HEXRD
run: |
pip install .
Expand Down
7 changes: 0 additions & 7 deletions conda.recipe/conda_build_config.yaml

This file was deleted.

10 changes: 5 additions & 5 deletions conda.recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
{% set python_min = "3.11" %}

package:
name: hexrdgui
version: {{ environ.get('GIT_DESCRIBE_TAG', environ['GIT_FULL_HASH'][:8]) }}
Expand All @@ -7,20 +9,18 @@ source:

build:
number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
noarch: python
entry_points:
- hexrdgui = hexrdgui.main:main

requirements:
build:
- python {{ python }} # [build_platform != target_platform]
- cross-python_{{ target_platform }} # [build_platform != target_platform]
host:
- python {{ python }}
- python {{ python_min }}
- setuptools
- setuptools_scm

run:
- python
- python >={{ python_min }}
- fabio
- hexrd=={{ hexrd_version }}
- matplotlib-base
Expand Down
3 changes: 1 addition & 2 deletions packaging/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ channels:
- conda-forge
- nodefaults
dependencies:
- python=3.11
- python=3.13
- coloredlogs
- conda
- cmake
- conda-build
- conda-pack
- click
- conda-libmamba-solver
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,10 @@
'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',
'Programming Language :: Python :: 3.14',
],
packages=find_packages(),
package_data={'hexrdgui': ['resources/**/*']},
Expand Down
Loading