Skip to content

Commit a806ce1

Browse files
authored
Merge pull request #9 from gboeing/update
Update to v0.3.3
2 parents 39478f1 + 1ed1cc8 commit a806ce1

13 files changed

Lines changed: 57 additions & 303 deletions

File tree

.github/workflows/tests.yml

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# This workflow runs the repo's CI tests.
12
name: tests
23

34
on:
@@ -16,42 +17,29 @@ jobs:
1617
fail-fast: false
1718
matrix:
1819
os: [ubuntu-latest]
19-
python-version: ['3.8', '3.9', '3.10']
20+
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
2021

2122
defaults:
2223
run:
23-
shell: bash -l {0}
24+
shell: bash -elo pipefail {0}
2425

2526
steps:
26-
2727
- name: Checkout repo
28-
uses: actions/checkout@v2
29-
with:
30-
fetch-depth: 2
31-
32-
- name: Cache conda
33-
uses: actions/cache@v2
34-
env:
35-
CACHE_NUMBER: 0
36-
with:
37-
path: ~/conda_pkgs_dir
38-
key: ${{ runner.os }}-python-${{ matrix.python-version }}-${{ env.CACHE_NUMBER }}-${{ hashFiles('tests/environment-dev.yml') }}
28+
uses: actions/checkout@v4
3929

40-
- name: Setup conda environment
41-
uses: conda-incubator/setup-miniconda@v2
30+
- name: Create environment with Micromamba
31+
uses: mamba-org/setup-micromamba@v2
4232
with:
43-
python-version: ${{ matrix.python-version }}
44-
use-only-tar-bz2: true # required for caching
45-
show-channel-urls: true
46-
channel-priority: strict
47-
activate-environment: pynamical-dev
33+
cache-environment: true
34+
create-args: python=${{ matrix.python-version }}
4835
environment-file: tests/environment-dev.yml
4936

5037
- name: Install pynamical
5138
run: |
52-
python setup.py install
53-
conda list
54-
conda info --all
39+
python -m pip install .
40+
python -m pip check
41+
micromamba list
42+
python -m pip show pynamical
5543
5644
- name: Lint code
5745
run: |

.readthedocs.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: 2
2+
3+
build:
4+
os: ubuntu-lts-latest
5+
tools:
6+
python: '3.12'
7+
8+
sphinx:
9+
configuration: docs/source/conf.py
10+
fail_on_warning: false

CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
# Change log
1+
# Changelog
2+
3+
## 0.3.3 (2025-04-15)
4+
5+
- final expected release of package
6+
- pin max version of dependencies
7+
- update dependencies compatibility
8+
- support python version 3.8-3.13
29

310
## 0.3.2 (2022-05-23)
411

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2015-2022 Geoff Boeing https://geoffboeing.com/
3+
Copyright (c) 2015-2025 Geoff Boeing https://geoffboeing.com/
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[![PyPI Version](https://badge.fury.io/py/pynamical.svg)](https://badge.fury.io/py/pynamical)
22
[![Anaconda Downloads](https://anaconda.org/conda-forge/pynamical/badges/downloads.svg)](https://anaconda.org/conda-forge/pynamical)
33
[![Documentation Status](https://readthedocs.org/projects/pynamical/badge/?version=latest)](https://pynamical.readthedocs.io/)
4-
[![Build Status](https://github.com/gboeing/pynamical/workflows/tests/badge.svg?branch=main)](https://github.com/gboeing/pynamical/actions?query=workflow%3A%22tests%22)
4+
[![Build Status](https://github.com/gboeing/pynamical/workflows/tests/badge.svg?branch=main)](https://github.com/gboeing/pynamical/actions/workflows/tests.yml/badge.svg?branch=main)
55
[![Coverage Status](https://codecov.io/gh/gboeing/pynamical/branch/main/graph/badge.svg)](https://codecov.io/gh/gboeing/pynamical)
66

77
# pynamical

docs/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@
6161

6262
# General information about the project.
6363
project = "pynamical"
64-
copyright = "2015-2022, Geoff Boeing"
64+
copyright = "2015-2025, Geoff Boeing"
6565
author = "Geoff Boeing"
6666

6767
# The version info for the project you're documenting, acts as replacement for
6868
# |version| and |release|, also used in various other places throughout the
6969
# built documents.
70-
version = release = "0.3.2"
70+
version = release = "0.3.3"
7171

7272
# The language for content autogenerated by Sphinx. Refer to documentation
7373
# for a list of supported languages.

pynamical/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
from .pynamical import *
44

5-
__version__ = "0.3.2"
5+
__version__ = "0.3.3"

pynamical/pynamical.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import os
44

5-
import matplotlib.cm as cm
65
import matplotlib.font_manager as fm
76
import matplotlib.pyplot as plt
87
import numpy as np
@@ -585,7 +584,7 @@ def get_phase_colors(color_request, length=1, color_reverse=False, default_color
585584
else:
586585
# if it's more than 1 character and doesn't start with # then it's
587586
# the name of a colormap
588-
color_map = cm.get_cmap(color_request)
587+
color_map = plt.get_cmap(color_request)
589588
color_list = color_map([x / float(length) for x in range(length)]).tolist()
590589

591590
# make sure list is same length as specified in length argument - if not,
@@ -953,7 +952,7 @@ def phase_diagram_3d(
953952

954953
# create new figure, set its size, and create an axis with 3-D projection
955954
fig = plt.figure(figsize=figsize)
956-
ax = fig.gca(projection="3d")
955+
ax = fig.add_subplot(projection="3d")
957956
ax.xaxis.set_pane_color((1, 1, 1, 1))
958957
ax.yaxis.set_pane_color((1, 1, 1, 1))
959958
ax.zaxis.set_pane_color((1, 1, 1, 1))

requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
matplotlib>=3.5
2-
numba>=0.53
3-
numpy>=1.20,<1.22
4-
pandas>=1.3
1+
matplotlib>=3.5,<3.11
2+
numba>=0.53,<0.62
3+
numpy>=1.20,<2.3
4+
pandas>=1.3,<2.3

setup.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
"Programming Language :: Python :: 3.8",
3737
"Programming Language :: Python :: 3.9",
3838
"Programming Language :: Python :: 3.10",
39+
"Programming Language :: Python :: 3.11",
40+
"Programming Language :: Python :: 3.12",
41+
"Programming Language :: Python :: 3.13",
3942
]
4043

4144
# only specify install_requires if not in RTD environment
@@ -47,7 +50,7 @@
4750

4851
setup(
4952
name="pynamical",
50-
version="0.3.2",
53+
version="0.3.3",
5154
description="Model, simulate, and visualize discrete nonlinear dynamical systems",
5255
long_description=LONG_DESCRIPTION,
5356
classifiers=CLASSIFIERS,
@@ -57,6 +60,6 @@
5760
license="MIT",
5861
platforms="any",
5962
packages=["pynamical"],
60-
python_requires=">=3.8",
63+
python_requires=">=3.8,<3.14",
6164
install_requires=INSTALL_REQUIRES,
6265
)

0 commit comments

Comments
 (0)