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.

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

Python 3.12 Support #548

Merged
merged 8 commits into from
Feb 6, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/ci-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
fail-fast: false
matrix:
os: [ "ubuntu-latest", "macos-latest", "windows-latest" ]
python-version: ["3.9", "3.10", "3.11"]
python-version: ["3.9", "3.10", "3.11", "3.12"]
steps:
- name: checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
fail-fast: false
matrix:
os: ["ubuntu-latest", "macos-latest", "windows-latest" ]
python-version: ["3.9", "3.10", "3.11"]
python-version: ["3.9", "3.10", "3.11", "3.12"]
steps:
- name: checkout
uses: actions/checkout@v4
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
| CI | [![GitHub Workflow Status][github-ci-badge]][github-ci-link] [![GitHub Workflow Status][github-upstream-ci-badge]][github-upstream-ci-link] [![Code Coverage Status][codecov-badge]][codecov-link] [![asv-badge]][asv-link] |
| :----------- | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
| **Docs** | [![Documentation Status][rtd-badge]][rtd-link] |
| **Package** | [![Conda][conda-badge]][conda-link] [![PyPI][pypi-badge]][pypi-link] |
| **Package** | [![Conda][conda-badge]][conda-link] [![PyPI][pypi-badge]][pypi-link] [![Python Version][python-version-badge]][python-version-badge-link] |
| **License** | [![License][license-badge]][repo-link] |
| **Citing** | [![DOI][doi-badge]][doi-link] |

Expand Down Expand Up @@ -47,6 +47,8 @@ https://geocat-comp.readthedocs.io/en/latest/citation.html) page.
[rtd-link]: https://geocat-comp.readthedocs.io/en/latest/?badge=latest
[pypi-badge]: https://img.shields.io/pypi/v/geocat-comp?logo=pypi&style=for-the-badge
[pypi-link]: https://pypi.org/project/geocat-comp
[python-version-badge]: https://img.shields.io/pypi/pyversions/geocat-comp?style=for-the-badge
[python-version-badge-link]: https://img.shields.io/pypi/pyversions/geocat-comp
[conda-badge]: https://img.shields.io/conda/vn/conda-forge/geocat-comp?logo=anaconda&style=for-the-badge
[conda-link]: https://anaconda.org/conda-forge/geocat-comp
[license-badge]: https://img.shields.io/github/license/NCAR/geocat-comp?style=for-the-badge
Expand Down
2 changes: 1 addition & 1 deletion build_envs/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: gc-docs
channels:
- conda-forge
dependencies:
- python>=3.9,<3.12
- python>=3.9,<3.13
- pre_commit
- geocat-datafiles
- geocat-viz
Expand Down
2 changes: 1 addition & 1 deletion build_envs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: geocat_comp_build
channels:
- conda-forge
dependencies:
- python>=3.9,<3.12 # minimum support 3.9
- python>=3.9,<3.13 # minimum support 3.9
- cf_xarray>=0.3.1 # min version 0.3.1 for dependencies
- cftime
- dask
Expand Down
8 changes: 7 additions & 1 deletion docs/contrib.rst
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ Use the following commands to create a new conda environment to develop
.. code-block:: bash

# Create a new conda environment
conda create -c conda-forge -n geocat_comp_build python=3.10
conda create -c conda-forge -n geocat_comp_build python=3.11

# Use the environment file to populate the environment with the required dependencies
conda env update -f build_envs/environment.yml
Expand Down Expand Up @@ -187,6 +187,12 @@ To create and check out a new branch, use the following command:

git checkout -b <branch-name>

Track upstream changes for `git pull` and `git push`

.. code-block:: bash

git branch --set-upstream-to=origin/<branch-name> <branch-name>

You can see a list of all branches in your local repository by running:

.. code-block:: bash
Expand Down
1 change: 1 addition & 0 deletions docs/release-notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Documentation
Internal Changes
^^^^^^^^^^^^^^^^
* Update hourly frequency aliases by `Katelyn FitzGerald`_ in (:pr:`550`)
* Python 3.12 Support by `Cora Schneck`_ in (:pr:`548`)


v2024.01.0 (January 30, 2023)
Expand Down
3 changes: 2 additions & 1 deletion setup.cfg
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
packages =
geocat
geocat.comp
Expand Down
Loading