Skip to content

Commit 30556ce

Browse files
authored
Merge pull request #206 from NREL/pp/upgrade_deps
Upgrade dependencies
2 parents f67fa90 + 5b310b6 commit 30556ce

File tree

7 files changed

+17
-52
lines changed

7 files changed

+17
-52
lines changed

.github/workflows/pull_request_tests.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,12 @@ jobs:
99
fail-fast: false
1010
matrix:
1111
os: [ubuntu-latest, macos-latest, windows-latest]
12-
python-version: [3.11]
12+
python-version: [3.13]
1313
include:
14+
- os: ubuntu-latest
15+
python-version: 3.12
16+
- os: ubuntu-latest
17+
python-version: 3.11
1418
- os: ubuntu-latest
1519
python-version: "3.10"
1620
- os: ubuntu-latest

.github/workflows/s3_tests.yml

Lines changed: 0 additions & 38 deletions
This file was deleted.

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Option 1: Install from PIP or Conda (recommended for analysts):
7474
2) or ``conda install nrel-rex --channel=nrel``
7575

7676
4. Install for users outside of NREL that want to access data via HSDS or S3 as per the instructions `here <https://nrel.github.io/rex/misc/examples.nrel_data.html#data-location-external-users>`_:
77-
1) ``pip install NREL-rex[hsds]`` for more performant access of the data on HSDS with slightly more setup as per `this hsds example <https://nrel.github.io/rex/misc/examples.hsds.html>`_
77+
1) ``pip install NREL-rex[hsds]`` for more performant access of the data on HSDS with slightly more setup as per `this hsds example <https://nrel.github.io/rex/misc/examples.hsds.html>`_. Note that the highest version of Python currently supported by ``hsds`` is Python 3.11.
7878

7979
Option 2: Clone repo (recommended for developers)
8080
-------------------------------------------------

examples/HSDS/README.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ otherwise.
1616
Extra Requirements
1717
------------------
1818

19-
You may need some additional software beyond the basic ``rex`` install to run this example:
19+
You may need some additional software beyond the basic ``rex`` install to run this example
20+
(make sure you are running not running higher than Python 3.11):
2021

2122
.. code-block:: bash
2223

pyproject.toml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,17 @@ classifiers=[
2828
"Programming Language :: Python :: 3.9",
2929
"Programming Language :: Python :: 3.10",
3030
"Programming Language :: Python :: 3.11",
31+
"Programming Language :: Python :: 3.12",
32+
"Programming Language :: Python :: 3.13",
3133
]
3234
dependencies = [
3335
"click>=8.1.8,<9",
3436
"fsspec>=2021.09.0,<2025",
3537
"dask>=2024.8.0,<2025",
36-
"h5py>=2.10.0,!=3.0.0",
38+
"h5py>=3.13.0,<4",
3739
"h5pyd>=0.18.0,<1",
38-
"numpy>=1.16",
39-
"pandas>=2.0.0,<3",
40+
"numpy>=2.0.2,<3",
41+
"pandas>=2.2.3,<3",
4042
"packaging>=24.2,<25",
4143
"psutil>=7.0.0,<8",
4244
"PyYAML>=6.0.2,<7",
@@ -49,7 +51,7 @@ dependencies = [
4951

5052
[project.optional-dependencies]
5153
test = [
52-
"pytest>=8.3.3,<9",
54+
"pytest>=8.3.5,<9",
5355
"pytest-timeout>=2.3.1,<3",
5456
"flaky>=3.8.1,<4",
5557
]
@@ -62,8 +64,8 @@ hsds = [
6264
"hsds>=0.8.4,<1",
6365
]
6466
build = [
65-
"build>=0.10,<1",
66-
"pkginfo>=1.10.0,<2",
67+
"build>=0.10,<0.11",
68+
"pkginfo>=1.12.1.2,<2",
6769
"twine>=6.1.0,<7",
6870
]
6971

rex/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
"""rex Version number"""
22

3-
__version__ = "0.2.100"
3+
__version__ = "0.3.0"
Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
# -*- coding: utf-8 -*-
22
"""
33
pytests for accessing NREL .h5 files on the cloud via hsds/h5pyd
4-
5-
Note that this file cannot be named "test_*.py" because it is run with a
6-
separate github action that sets up a local hsds server before running the
7-
test.
84
"""
95
import numpy as np
106
import xarray as xr

0 commit comments

Comments
 (0)