Skip to content

Commit

Permalink
Build and recommend python3.11
Browse files Browse the repository at this point in the history
This removes support for python3.8 and adds support for python3.11,
which is now recommended. python3.11 comes with several performance
improvements that may benefit us.

python3.12 just came out a couple of weeks ago, but not all of our
dependencies support it yet (it's not supported by: `fabio`, `numba`,
and `silx` yet).

Signed-off-by: Patrick Avery <[email protected]>
  • Loading branch information
psavery committed Oct 18, 2023
1 parent fffb864 commit f27357a
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/container_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ chmod a+x Miniconda3-latest-Linux-x86_64.sh
./Miniconda3-latest-Linux-x86_64.sh -b

# Set up the hexrd channel
${HOME}/miniconda3/bin/conda create --override-channels -c conda-forge -y -n hexrd python=3.9
${HOME}/miniconda3/bin/conda create --override-channels -c conda-forge -y -n hexrd python=3.11
${HOME}/miniconda3/bin/activate hexrd
${HOME}/miniconda3/bin/conda activate hexrd

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
uses: conda-incubator/setup-miniconda@v2
with:
auto-update-conda: true
python-version: 3.9
python-version: 3.11
activate-environment: hexrd
auto-activate-base: false

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: true
matrix:
python-version: [3.8]
python-version: [3.11]
config:
- {
name: "Linux",
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ python:
build:
os: ubuntu-22.04
tools:
python: '3.10'
python: '3.11'
jobs:
pre_build:
# Run the apidoc command to generate the initial module files
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ The HEXRD project is developing a cross-platform, open-source library for the ge

# Installing

Requires Python 3.8+ (Python 3.9 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.9+ (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).

## conda (main releases)

Expand Down Expand Up @@ -59,7 +59,7 @@ See [Citing HEXRD](https://hexrdgui.readthedocs.io/en/latest/citing/#hexrd) for
# Development
Requires Python 3.8+ and a C compiler (_e.g._, `gcc` or VisualStudio). First clone the Git repository:
Requires Python 3.9+ 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 @@ -82,7 +82,7 @@ conda activate hexrd-dev
### Linux and Mac OS
```bash
# First, make sure python3.8+ is installed in your target env.
# First, make sure python3.9+ is installed in your target env.
# If it is not, run the following command:
conda install -c conda-forge python=3.9
Expand All @@ -95,7 +95,7 @@ CONDA_BUILD=1 pip install --no-build-isolation --no-deps -U -e hexrd

### Windows
```bash
# First, make sure python3.8+ is installed in your target env.
# First, make sure python3.9+ is installed in your target env.
# If it is not, run the following command:
conda install -c conda-forge python=3.9

Expand Down
2 changes: 1 addition & 1 deletion conda.recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
python:
- 3.8
- 3.9
- 3.10
- 3.11
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: hexrd-test
dependencies:
- python=3.10
- python=3.11
- conda-build
7 changes: 3 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,15 @@ def get_extension_modules():
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10'

'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
],
entry_points = entry_points,
ext_modules=ext_modules,
packages=find_packages(),
include_package_data=True,
package_data={'':['Anomalous.h5']},
python_requires='>=3.8',
python_requires='>=3.9',
install_requires=install_reqs
)

0 comments on commit f27357a

Please sign in to comment.