Skip to content

Commit fa9c1ec

Browse files
committed
Merge branch 'grassia2geo-dist' of https://github.com/ColtAllen/pymc-extras into grassia2geo-dist
2 parents 7c7afc8 + f3ae359 commit fa9c1ec

File tree

82 files changed

+4724
-1476
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+4724
-1476
lines changed

.gitattributes

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/workflows/pypi.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
fetch-depth: 0
1818
- uses: actions/setup-python@v5
1919
with:
20-
python-version: "3.10"
20+
python-version: "3.11"
2121
- name: Build the sdist and the wheel
2222
run: |
2323
pip install build

.github/workflows/test.yml

Lines changed: 38 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,29 @@ on:
1010
- "tests/**"
1111
- "setup.py"
1212
- "pyproject.toml"
13-
- "buildosx"
1413
- "conda-envs/**"
1514
- "codecov.yml"
1615

16+
# Cancels all previous workflow runs for pull requests that have not completed.
17+
concurrency:
18+
# The concurrency group contains the workflow name and the branch name for pull requests
19+
# or the commit hash for any other events.
20+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
21+
cancel-in-progress: true
22+
1723
jobs:
1824
ubuntu:
1925
strategy:
2026
matrix:
2127
os: [ubuntu-latest]
22-
python-version: ["3.10"]
28+
python-version: ["3.11"]
2329
test-subset:
24-
- tests
30+
- tests/model
31+
- tests/statespace/core/test_statespace.py
32+
- tests/statespace/filters/test_kalman_filter.py
33+
- tests/statespace --ignore tests/statespace/core/test_statespace.py --ignore tests/statespace/filters/test_kalman_filter.py
34+
- tests/distributions
35+
- tests --ignore tests/model --ignore tests/statespace --ignore tests/distributions
2536
fail-fast: false
2637
runs-on: ${{ matrix.os }}
2738
env:
@@ -32,7 +43,7 @@ jobs:
3243
shell: bash -leo pipefail {0}
3344
steps:
3445
- uses: actions/checkout@v4
35-
- uses: mamba-org/setup-micromamba@v1
46+
- uses: mamba-org/setup-micromamba@v2
3647
with:
3748
environment-file: conda-envs/environment-test.yml
3849
create-args: >-
@@ -42,11 +53,12 @@ jobs:
4253
cache-environment: true
4354
- name: Install pymc-extras
4455
run: |
45-
pip install -e .
56+
pip install -e ".[dev]"
4657
python --version
58+
pip check
4759
- name: Run tests
4860
run: |
49-
python -m pytest -vv --cov=pymc_extras --cov-append --cov-report=xml --cov-report term --durations=50 $TEST_SUBSET
61+
python -m pytest --color=yes -vv --cov=pymc_extras --cov-append --cov-report=xml --cov-report term --durations=50 $TEST_SUBSET
5062
- name: Upload coverage to Codecov
5163
uses: codecov/codecov-action@v2
5264
with:
@@ -59,7 +71,12 @@ jobs:
5971
os: [windows-latest]
6072
python-version: ["3.12"]
6173
test-subset:
62-
- tests
74+
- tests/model
75+
- tests/statespace/core/test_statespace.py
76+
- tests/statespace/filters/test_kalman_filter.py
77+
- tests/statespace --ignore tests/statespace/core/test_statespace.py --ignore tests/statespace/filters/test_kalman_filter.py
78+
- tests/distributions
79+
- tests --ignore tests/model --ignore tests/statespace --ignore tests/distributions
6380
fail-fast: false
6481
runs-on: ${{ matrix.os }}
6582
env:
@@ -70,27 +87,36 @@ jobs:
7087
shell: cmd /C call {0}
7188
steps:
7289
- uses: actions/checkout@v4
73-
- uses: mamba-org/setup-micromamba@v1
90+
- uses: mamba-org/setup-micromamba@v2
7491
with:
75-
environment-file: conda-envs/windows-environment-test.yml
76-
micromamba-version: "1.5.10-0" # Until https://github.com/mamba-org/mamba/issues/3467 is not fixed
92+
environment-file: conda-envs/environment-test.yml
93+
micromamba-version: "latest"
7794
create-args: >-
7895
python=${{matrix.python-version}}
7996
environment-name: pymc-extras-test
8097
init-shell: cmd.exe
8198
cache-environment: true
8299
- name: Install pymc-extras
83100
run: |
84-
pip install -e .
101+
pip install -e ".[dev]"
85102
python --version
86103
- name: Run tests
87104
# This job uses a cmd shell, therefore the environment variable syntax is different!
88105
# The ">-" in the next line replaces newlines with spaces (see https://stackoverflow.com/a/66809682).
89106
run: >-
90-
python -m pytest -vv --cov=pymc_extras --cov-append --cov-report=xml --cov-report term --durations=50 %TEST_SUBSET%
107+
python -m pytest --color=yes -vv --cov=pymc_extras --cov-append --cov-report=xml --cov-report term --durations=50 %TEST_SUBSET%
91108
- name: Upload coverage to Codecov
92109
uses: codecov/codecov-action@v2
93110
with:
94111
env_vars: TEST_SUBSET
95112
name: ${{ matrix.os }}
96113
fail_ci_if_error: false
114+
115+
all_tests:
116+
if: ${{ always() }}
117+
runs-on: ubuntu-latest
118+
needs: [ ubuntu, windows ]
119+
steps:
120+
- name: Check all tests pass
121+
if: ${{ needs.ubuntu.result != 'success' || needs.windows.result != 'success' }}
122+
run: exit 1

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ tmtags
1111
tags
1212
.DS_Store
1313
.cache
14+
_version.py
1415
# IntelliJ IDE
1516
.idea
1617
*.iml

.gitpod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ tasks:
88
conda env update -f conda-envs/environment-test.yml -p env
99
conda activate /workspace/pymc-extras/env
1010
pip install -r requirements-dev.txt
11-
pip install -e .
11+
pip install -e ."[dev]"
1212
command: |
1313
conda init bash && echo "conda activate /workspace/pymc-extras/env" >> ~/.bashrc && source ~/.bashrc
1414

.pre-commit-config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,4 @@ repos:
2626
rev: 0.4.1
2727
hooks:
2828
- id: no-print-statements
29-
exclude: _version.py
3029
files: ^pymc_extras/

0 commit comments

Comments
 (0)