Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Python 3.12 support and Windows and M1 testing #194

Merged
merged 1 commit into from
Feb 2, 2024
Merged

Python 3.12 support and Windows and M1 testing #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 13 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ "ubuntu-latest", "macos-latest"]
python-version: [ "3.9", "3.10", "3.11" ]
os: [ "ubuntu-latest", "macos-latest", "macos-14", "windows-latest"]
python-version: [ "3.9", "3.11", "3.12" ]
steps:
- name: Cancel previous runs
uses: styfle/[email protected]
Expand All @@ -32,13 +32,23 @@ jobs:
token: ${{ github.token }}
- name: conda_setup
uses: conda-incubator/setup-miniconda@v2
if: matrix.os != 'macos-14'
with:
activate-environment: geocat_viz_build
channel-priority: strict
python-version: ${{ matrix.python-version }}
channels: conda-forge
environment-file: build_envs/environment.yml

- name: conda_setup_m1
uses: conda-incubator/setup-miniconda@v2
if: matrix.os == 'macos-14'
with:
installer-url: https://github.com/conda-forge/miniforge/releases/download/23.11.0-0/Mambaforge-23.11.0-0-MacOSX-arm64.sh
activate-environment: geocat_viz_build
channel-priority: strict
python-version: ${{ matrix.python-version }}
channels: conda-forge
environment-file: build_envs/environment.yml
- name: Install geocat-viz
run: |
python -m pip install . --no-deps
Expand Down
2 changes: 1 addition & 1 deletion build_envs/docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: gv-docs
channels:
- conda-forge
dependencies:
- python>=3.9, <3.12
- python>=3.9, <3.13
- cartopy
- cmaps
- matplotlib
Expand Down
2 changes: 1 addition & 1 deletion build_envs/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: geocat_viz_build
channels:
- conda-forge
dependencies:
- python>=3.9, <3.12
- python>=3.9, <3.13
- cartopy
- make
- matplotlib
Expand Down
1 change: 1 addition & 0 deletions docs/release-notes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ v2024.1.0 (Unreleased)
New Features
^^^^^^^^^^^^
* Added subtitle functionality to `set_titles_and_labels()` by `Julia Kent`_ in (:pr:`185`)
* Added Python 3.12 support and testing for Windows and M1 by `Katelyn FitzGerald`_ in (:pr:`194`)

Documentation
^^^^^^^^^^^^^
Expand Down
3 changes: 2 additions & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,13 @@ classifiers =
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Programming Language :: Python :: 3.12
Topic :: Scientific/Engineering

[options]
zip_safe = False
include_package_data = True
python_requires = >=3.9, <3.12
python_requires = >=3.9, <3.13
package_dir =
=src
packages =
Expand Down
Loading