Skip to content

Commit

Permalink
Merge pull request #526 from briochh/hotfix_numpy2
Browse files Browse the repository at this point in the history
Temp pin in numpy to < 2.0
  • Loading branch information
briochh committed Jul 19, 2024
2 parents ef75e32 + 3098ed0 commit 169a036
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ jobs:
python=${{ matrix.python-version }}
cache-downloads: true
cache-environment: true
cache-environment-key: environment-${{ steps.date.outputs.date }}
cache-downloads-key: downloads-${{ steps.date.outputs.date }}

- name: Install pyemu
shell: bash -l {0}
Expand Down
2 changes: 1 addition & 1 deletion etc/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
dependencies:
# required
- python>=3.8
- numpy
- numpy<2.0
- pandas
# optional
- matplotlib
Expand Down
3 changes: 1 addition & 2 deletions pyemu/pst/pst_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@
import time
import warnings
import numpy as np
from numpy.lib.type_check import real_if_close
import pandas as pd


pd.options.display.max_colwidth = 100
# pd.options.mode.use_inf_as_na = True
import pyemu
Expand All @@ -21,6 +19,7 @@

# from pyemu.utils.os_utils import run


def get_constraint_tags(ltgt='lt'):
if ltgt == 'lt':
return "l_", "less", ">@"
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ classifiers = [
]
requires-python = ">=3.8"
dependencies = [
"numpy",
"numpy <2.0.0",
"pandas",
]

Expand Down

0 comments on commit 169a036

Please sign in to comment.