Skip to content

Commit

Permalink
remove numpy pin (#272)
Browse files Browse the repository at this point in the history
  • Loading branch information
DManowitz authored Jul 4, 2024
1 parent 88fa68a commit b52b044
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: [3.7, 3.8, 3.9, '3.10']
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
steps:
- name: Clone repo
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
- conda-forge
dependencies:
- jupyterlab
- numpy<1.24
- numpy
- numba
- pandas
- scikit-learn
Expand Down
5 changes: 4 additions & 1 deletion hierarchicalforecast/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,10 @@ def plot_series(self,
df_plot = Y_df.loc[series].set_index('ds')
cols = models if models is not None else df_plot.columns
cols_wo_levels = [col for col in cols if ('-lo-' not in col and '-hi-' not in col)]
cmap = plt.cm.get_cmap("tab10", 10)
try:
cmap = plt.get_cmap("tab10", 10)
except AttributeError:
cmap = plt.cm.get_cmap("tab10", 10)
cmap = [cmap(i) for i in range(10)][:len(cols_wo_levels)]
cmap_dict = dict(zip(cols_wo_levels, cmap))
for col in cols_wo_levels:
Expand Down
5 changes: 4 additions & 1 deletion nbs/utils.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,10 @@
" df_plot = Y_df.loc[series].set_index('ds')\n",
" cols = models if models is not None else df_plot.columns\n",
" cols_wo_levels = [col for col in cols if ('-lo-' not in col and '-hi-' not in col)]\n",
" cmap = plt.cm.get_cmap(\"tab10\", 10)\n",
" try:\n",
" cmap = plt.get_cmap(\"tab10\", 10)\n",
" except AttributeError:\n",
" cmap = plt.cm.get_cmap(\"tab10\", 10)\n",
" cmap = [cmap(i) for i in range(10)][:len(cols_wo_levels)]\n",
" cmap_dict = dict(zip(cols_wo_levels, cmap))\n",
" for col in cols_wo_levels:\n",
Expand Down
4 changes: 2 additions & 2 deletions settings.ini
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ author_email = business@nixtla.io
copyright = Nixtla Inc.
branch = main
version = 0.4.1
min_python = 3.7
min_python = 3.8
audience = Developers
language = English
custom_sidebar = True
license = apache2
status = 2
requirements = numpy<1.24 numba pandas scikit-learn quadprog matplotlib tqdm
requirements = numpy numba pandas scikit-learn quadprog matplotlib tqdm
dev_requirements = datasetsforecast nbdev statsforecast>=1.0.0 requests scipy
nbs_path = nbs
doc_path = _docs
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
}
statuses = [ '1 - Planning', '2 - Pre-Alpha', '3 - Alpha',
'4 - Beta', '5 - Production/Stable', '6 - Mature', '7 - Inactive' ]
py_versions = '3.6 3.7 3.8 3.9 3.10'.split()
py_versions = '3.8 3.9 3.10 3.11 3.12'.split()

requirements = cfg.get('requirements','').split()
if cfg.get('pip_requirements'): requirements += cfg.get('pip_requirements','').split()
Expand Down

0 comments on commit b52b044

Please sign in to comment.