diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 2632bd120..4a3fa39b2 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -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. diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c2eb9f9b1..6919ef02d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: true matrix: - python-version: ['3.11'] + python-version: ['3.11', '3.14'] config: - { name: "Linux", @@ -21,7 +21,7 @@ jobs: } - { name: "MacOSX", - os: macos-15 + os: macos-latest } - { name: "Windows", @@ -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 . diff --git a/conda.recipe/conda_build_config.yaml b/conda.recipe/conda_build_config.yaml deleted file mode 100644 index 4d978d7db..000000000 --- a/conda.recipe/conda_build_config.yaml +++ /dev/null @@ -1,7 +0,0 @@ -python: - - 3.11 -target_platform: - - linux-64 # [linux] - - osx-64 # [osx] - - osx-arm64 # [osx] - - win-64 # [win] diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index f992301c8..da2b285b7 100644 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -1,3 +1,5 @@ +{% set python_min = "3.11" %} + package: name: hexrdgui version: {{ environ.get('GIT_DESCRIBE_TAG', environ['GIT_FULL_HASH'][:8]) }} @@ -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 diff --git a/packaging/environment.yml b/packaging/environment.yml index 56b167a88..53d99e5a8 100644 --- a/packaging/environment.yml +++ b/packaging/environment.yml @@ -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 diff --git a/setup.py b/setup.py index d41e69f26..0e4fc1a00 100644 --- a/setup.py +++ b/setup.py @@ -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/**/*']},