Skip to content

Commit

Permalink
Merge pull request #1175 from openghg/increase-min-python-version-to-310
Browse files Browse the repository at this point in the history
  • Loading branch information
brendan-m-murphy authored Nov 16, 2024
2 parents e8a88ea + 14359b7 commit f16f1f2
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 11 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
fail-fast: false
matrix:
operating-system: [ubuntu-latest]
python-version: ["3.9", "3.10", "3.11", "3.12"]
python-version: ["3.10", "3.11", "3.12"]
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: "3.9"
python-version: "3.10"
cache: "pip"
- name: Install openghg
run: |
Expand Down Expand Up @@ -96,10 +96,10 @@ jobs:
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') && !contains(github.ref_name, '-') && contains(github.ref_name, '.')
steps:
- uses: actions/checkout@v3
- name: Set up Python 3.9
- name: Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: "3.9"
python-version: "3.10"
cache: "pip"
- name: Install pypa/build
run: |
Expand Down Expand Up @@ -146,4 +146,4 @@ jobs:
anaconda --token "$ANACONDA_TOKEN" upload --user openghg --label main "$BUILD"
env:
ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN_EXP_2025_08_14 }}
GIT_TAG: ${{ github.ref_name }}
GIT_TAG: ${{ github.ref_name }}
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Updated

- Minimum version of python to 3.10. [PR #1175](https://github.com/openghg/openghg/pull/1175)
- Updated ICOS standardise function to reflect changes in ASCII file format. [PR #1140](https://github.com/openghg/openghg/pull/1140)
- Added `rename_vars` option to `get_obs_surface` to allow variable names based around species to be returned. [PR #1130](https://github.com/openghg/openghg/pull/1130)
- Added option to `get_obs_column` to return the column data directly rather than converting to mole fractions. [PR #1131](https://github.com/openghg/openghg/pull/1131)
Expand Down
2 changes: 1 addition & 1 deletion environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ channels:
- defaults
- anaconda
dependencies:
- python>=3.9
- python>=3.10
- addict
- dask
- h5netcdf
Expand Down
4 changes: 2 additions & 2 deletions openghg/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"util",
]

if _sys.version_info < (3, 9):
raise ImportError("openghg requires Python >= 3.9")
if _sys.version_info < (3, 10):
raise ImportError("openghg requires Python >= 3.10")

v = get_versions()

Expand Down
1 change: 0 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ classifiers =
Programming Language :: Cython
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Programming Language :: Python :: 3.12
Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
packages=setuptools.find_packages(include=["openghg", "openghg.*"]),
package_data={"": ["data/*", "data/config/objectstore/*", "py.typed"]},
classifiers=[
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
Expand All @@ -41,5 +40,5 @@
"openghg = openghg.util:cli",
]
},
python_requires=">=3.9",
python_requires=">=3.10",
)

0 comments on commit f16f1f2

Please sign in to comment.