From 3a23eb1498b22e52e0c9399add76dd21ea7e9511 Mon Sep 17 00:00:00 2001 From: Nicholas Reinicke Date: Wed, 10 Jul 2024 17:02:22 -0600 Subject: [PATCH 1/2] pin onnxruntime version --- .github/workflows/deploy-docs.yaml | 1 + .github/workflows/test.yaml | 1 + README.md | 1 + pyproject.toml | 6 +++--- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy-docs.yaml b/.github/workflows/deploy-docs.yaml index 8aaf025..1681398 100644 --- a/.github/workflows/deploy-docs.yaml +++ b/.github/workflows/deploy-docs.yaml @@ -21,6 +21,7 @@ jobs: - name: Install dependencies run: | + python -m pip install --upgrade pip pip install ".[dev]" # Build the book diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 6fbc583..937cc1d 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -34,6 +34,7 @@ jobs: - name: Install package run: | + pip install pip --upgrade pip install ".[dev]" - name: Run mypy diff --git a/README.md b/README.md index d5a76f4..3159eff 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,7 @@ own drive-cycle data, powertrain modeling system, and road network data to train RouteE Powertrain is available on PyPI and can be installed with `pip`: ```bash +pip install pip --upgrade pip install nrel.routee.powertrain ``` diff --git a/pyproject.toml b/pyproject.toml index 23ee1c9..7a80328 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "nrel.routee.powertrain" -version = "1.0.4" +version = "1.1.0" description = "RouteE-Powertrain is a tool for predicting energy usage over a set of road links." readme = "README.md" authors = [{ name = "National Renewable Energy Laboratory" }] @@ -17,8 +17,8 @@ classifiers = [ "Programming Language :: Python", "Topic :: Scientific/Engineering", ] -dependencies = ["pandas", "numpy", "onnx", "onnxruntime"] -requires-python = ">=3.8,<3.12" +dependencies = ["pandas", "numpy", "onnx", "onnxruntime==1.18.1"] +requires-python = ">=3.8" [project.optional-dependencies] scikit = ["scikit-learn", "skl2onnx"] From 7a51fb86aa71e74e690e46fb651be1dd71ab2d00 Mon Sep 17 00:00:00 2001 From: Nicholas Reinicke Date: Wed, 10 Jul 2024 17:03:47 -0600 Subject: [PATCH 2/2] add test for python 3.12 --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 937cc1d..84e3dee 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.8", "3.9", "3.10", "3.11"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] env: PYTHON: ${{ matrix.python-version }}