Skip to content

Commit

Permalink
Merge pull request #25 from jpn--/develop
Browse files Browse the repository at this point in the history
Pandas 1.5 incompatibility
  • Loading branch information
jpn-- committed Oct 9, 2022
2 parents 0df182e + 0ba8348 commit 06e65be
Show file tree
Hide file tree
Showing 10 changed files with 1,304 additions and 1,039 deletions.
4 changes: 2 additions & 2 deletions book/_config.yml
@@ -1,7 +1,7 @@
# Book settings
# Learn more at https://jupyterbook.org/customize/config.html

title: "v5.7.0"
title: "v5.7.1"
author: Jeffrey Newman
logo: img/larch-logo.png

Expand Down Expand Up @@ -99,6 +99,6 @@ sphinx:
switcher:
json_url: https://larch.newman.me/_static/switcher.json
url_template: https://larch.newman.me/v{version}/
version_match: 5.7.0
version_match: 5.7.1
navbar_end:
- version-switcher
4 changes: 2 additions & 2 deletions book/_static/switcher.json
@@ -1,7 +1,7 @@
[
{
"name": "v5.7.0 (latest)",
"version": "5.7.0"
"name": "v5.7.1 (latest)",
"version": "5.7.1"
},
{
"version": "5.4.1"
Expand Down
3 changes: 1 addition & 2 deletions bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 5.7.0
current_version = 5.7.1
commit = True
tag = True

Expand All @@ -10,4 +10,3 @@ tag = True
[bumpversion:file:book/_config.yml]

[bumpversion:file:book/_static/switcher.json]

4 changes: 2 additions & 2 deletions conda-recipe/meta.yaml
@@ -1,6 +1,6 @@
package:
name: larch
version: "5.7.0"
version: "5.7.1"

source:
path: ../
Expand Down Expand Up @@ -34,7 +34,7 @@ requirements:
- llvm-openmp # [osx]
- {{ pin_compatible('numpy', upper_bound='1.22') }}
- scipy >=1.1
- pandas >=0.24
- pandas >=0.24,<1.5
- pytables >=3.4.4 # https://github.com/conda-forge/pytables-feedstock/issues/31
- blosc >=1.14.3
- matplotlib >=3.0
Expand Down
2 changes: 1 addition & 1 deletion environments/development.yml
Expand Up @@ -31,7 +31,7 @@ dependencies:
- numexpr
- openmatrix
- openpyxl
- pandas >=1.2
- pandas >=1.2,<1.5
- pillow
- pyarrow
- pydot
Expand Down
2 changes: 1 addition & 1 deletion larch/__init__.py
@@ -1,5 +1,5 @@

__version__ = '5.7.0'
__version__ = '5.7.1'

from .util.interface_info import Info, ipython_status
import sys
Expand Down

0 comments on commit 06e65be

Please sign in to comment.