From 3d16702957647bd8f72f8a22efee21e902d9ae9d Mon Sep 17 00:00:00 2001 From: zchmielewska Date: Mon, 25 Nov 2024 14:42:32 +0100 Subject: [PATCH] python v3.11 --- .github/workflows/build_deploy.yml | 6 +++--- .github/workflows/pytest.yml | 2 +- README.md | 8 ++------ dev_models/__init__.py | 0 dev_models/dev_model_01/__init__.py | 0 dev_models/dev_model_02/__init__.py | 0 dev_models/dev_model_03/__init__.py | 0 dev_models/dev_model_04/__init__.py | 0 dev_models/dev_model_05/__init__.py | 0 dev_models/dev_model_06/__init__.py | 0 dev_models/dev_model_07/__init__.py | 0 dev_models/dev_model_08/__init__.py | 0 dev_models/dev_model_09/__init__.py | 0 dev_models/dev_model_10/__init__.py | 0 dev_models/dev_model_11/__init__.py | 0 dev_models/dev_model_12/__init__.py | 0 dev_models/dev_model_13/__init__.py | 0 dev_models/dev_model_14/__init__.py | 0 dev_models/dev_model_15/__init__.py | 0 dev_models/dev_model_16/__init__.py | 0 dev_models/dev_model_17/__init__.py | 0 dev_models/dev_model_18/__init__.py | 0 dev_models/dev_model_19/__init__.py | 0 dev_models/dev_model_20/__init__.py | 0 dev_models/dev_model_21/__init__.py | 0 dev_models/dev_model_22/__init__.py | 0 dev_models/dev_model_23/__init__.py | 0 dev_models/dev_model_24/__init__.py | 0 dev_models/dev_model_25/__init__.py | 0 dev_models/dev_model_99/__init__.py | 0 requirements.txt | 4 ++-- setup.py | 4 ++-- 32 files changed, 10 insertions(+), 14 deletions(-) create mode 100644 dev_models/__init__.py create mode 100644 dev_models/dev_model_01/__init__.py create mode 100644 dev_models/dev_model_02/__init__.py create mode 100644 dev_models/dev_model_03/__init__.py create mode 100644 dev_models/dev_model_04/__init__.py create mode 100644 dev_models/dev_model_05/__init__.py create mode 100644 dev_models/dev_model_06/__init__.py create mode 100644 dev_models/dev_model_07/__init__.py create mode 100644 dev_models/dev_model_08/__init__.py create mode 100644 dev_models/dev_model_09/__init__.py create mode 100644 dev_models/dev_model_10/__init__.py create mode 100644 dev_models/dev_model_11/__init__.py create mode 100644 dev_models/dev_model_12/__init__.py create mode 100644 dev_models/dev_model_13/__init__.py create mode 100644 dev_models/dev_model_14/__init__.py create mode 100644 dev_models/dev_model_15/__init__.py create mode 100644 dev_models/dev_model_16/__init__.py create mode 100644 dev_models/dev_model_17/__init__.py create mode 100644 dev_models/dev_model_18/__init__.py create mode 100644 dev_models/dev_model_19/__init__.py create mode 100644 dev_models/dev_model_20/__init__.py create mode 100644 dev_models/dev_model_21/__init__.py create mode 100644 dev_models/dev_model_22/__init__.py create mode 100644 dev_models/dev_model_23/__init__.py create mode 100644 dev_models/dev_model_24/__init__.py create mode 100644 dev_models/dev_model_25/__init__.py create mode 100644 dev_models/dev_model_99/__init__.py diff --git a/.github/workflows/build_deploy.yml b/.github/workflows/build_deploy.yml index 415f330..e83792e 100644 --- a/.github/workflows/build_deploy.yml +++ b/.github/workflows/build_deploy.yml @@ -21,7 +21,7 @@ jobs: run: | python -m venv venv source venv/bin/activate - python -m pip install --upgrade pip setuptools Cython numpy==1.21.1 --no-cache-dir + python -m pip install --upgrade pip setuptools Cython numpy - name: Build Cython extensions run: | @@ -40,7 +40,7 @@ jobs: run: | python -m venv venv source venv/bin/activate - python -m pip install --upgrade pip setuptools Cython numpy==1.21.1 + python -m pip install --upgrade pip setuptools Cython numpy - name: Build source distribution run: | @@ -66,7 +66,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install Cython - python -m pip install numpy==1.21.1 + python -m pip install numpy - name: Build wheels uses: pypa/cibuildwheel@v2.18.0 diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 9cad25d..5848f7b 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.9] + python-version: [3.11] steps: - name: Checkout diff --git a/README.md b/README.md index b91f7bf..0d7390d 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,6 @@ Cashflower is an open-source Python framework for actuarial cash flow models. -# Prerequisites - -Python version >=3.9 - -# Usage - ## Installation *terminal* @@ -43,6 +37,8 @@ my_model/ *my_model/model.py* ```python +from cashflower import variable + @variable() def survival_probability(t): mortality_rate = 0.01 diff --git a/dev_models/__init__.py b/dev_models/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dev_models/dev_model_01/__init__.py b/dev_models/dev_model_01/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dev_models/dev_model_02/__init__.py b/dev_models/dev_model_02/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dev_models/dev_model_03/__init__.py b/dev_models/dev_model_03/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dev_models/dev_model_04/__init__.py b/dev_models/dev_model_04/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dev_models/dev_model_05/__init__.py b/dev_models/dev_model_05/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dev_models/dev_model_06/__init__.py b/dev_models/dev_model_06/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dev_models/dev_model_07/__init__.py b/dev_models/dev_model_07/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dev_models/dev_model_08/__init__.py b/dev_models/dev_model_08/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dev_models/dev_model_09/__init__.py b/dev_models/dev_model_09/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dev_models/dev_model_10/__init__.py b/dev_models/dev_model_10/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dev_models/dev_model_11/__init__.py b/dev_models/dev_model_11/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dev_models/dev_model_12/__init__.py b/dev_models/dev_model_12/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dev_models/dev_model_13/__init__.py b/dev_models/dev_model_13/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dev_models/dev_model_14/__init__.py b/dev_models/dev_model_14/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dev_models/dev_model_15/__init__.py b/dev_models/dev_model_15/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dev_models/dev_model_16/__init__.py b/dev_models/dev_model_16/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dev_models/dev_model_17/__init__.py b/dev_models/dev_model_17/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dev_models/dev_model_18/__init__.py b/dev_models/dev_model_18/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dev_models/dev_model_19/__init__.py b/dev_models/dev_model_19/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dev_models/dev_model_20/__init__.py b/dev_models/dev_model_20/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dev_models/dev_model_21/__init__.py b/dev_models/dev_model_21/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dev_models/dev_model_22/__init__.py b/dev_models/dev_model_22/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dev_models/dev_model_23/__init__.py b/dev_models/dev_model_23/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dev_models/dev_model_24/__init__.py b/dev_models/dev_model_24/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dev_models/dev_model_25/__init__.py b/dev_models/dev_model_25/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dev_models/dev_model_99/__init__.py b/dev_models/dev_model_99/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/requirements.txt b/requirements.txt index 1664506..618c10a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,11 @@ Cython==3.0.2 furo==2023.9.10 networkx==3.1 -numpy==1.21.1 +numpy==2.0.1 pandas==2.2.2 psutil==5.9.5 pytest==7.4.2 ruff==0.0.291 setuptools==73.0.1 Sphinx==7.2.6 -wheel==0.44.0 +wheel==0.44.0 \ No newline at end of file diff --git a/setup.py b/setup.py index 6e14d77..edbedd5 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ 'pandas', 'psutil', 'networkx', - 'numpy==1.21.1' + 'numpy' ], long_description=long_description, long_description_content_type="text/markdown", @@ -38,7 +38,7 @@ 'Documentation': 'https://cashflower.acturtle.com', 'Cheat sheet': 'https://www.acturtle.com/static/pdf/cheat_sheet.pdf', }, - python_requires='>=3.9', + python_requires='>=3.11', url="https://github.com/acturtle/cashflower", version="0.9.1", )