Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace documentation references to SimpleModel with FunctionModel #629

Merged
merged 3 commits into from
Mar 12, 2024

Conversation

omsai
Copy link

@omsai omsai commented Feb 26, 2024

SimpleModel was removed in 3fc1a52

  • I confirmed that the sphinx docs build as expected.
  • FYI the pre-commit hook recommended by CONTRIBUTE.rst fails as follows:
[INFO] Initializing environment for https://github.com/psf/black.
[INFO] Initializing environment for https://github.com/pycqa/isort.
[INFO] Initializing environment for https://github.com/nbQA-dev/nbQA.
[INFO] Initializing environment for https://github.com/nbQA-dev/nbQA:black.
[INFO] Initializing environment for https://github.com/nbQA-dev/nbQA:pyupgrade.
[INFO] Initializing environment for https://github.com/nbQA-dev/nbQA:isort.
[INFO] Initializing environment for https://github.com/pre-commit/pre-commit-hooks.
[INFO] Installing environment for https://github.com/psf/black.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
[INFO] Installing environment for https://github.com/pycqa/isort.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
[INFO] Installing environment for https://github.com/nbQA-dev/nbQA.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
[INFO] Installing environment for https://github.com/nbQA-dev/nbQA.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
[INFO] Installing environment for https://github.com/nbQA-dev/nbQA.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
[INFO] Installing environment for https://github.com/pre-commit/pre-commit-hooks.
[INFO] Once installed this environment will be reused.
[INFO] This may take a few minutes...
black....................................................................Passed
isort (python)...........................................................Passed
isort (cython).......................................(no files to check)Skipped
isort (pyi)..........................................(no files to check)Skipped
nbqa-black...........................................(no files to check)Skipped
nbqa-pyupgrade.......................................(no files to check)Skipped
nbqa-isort...........................................(no files to check)Skipped
check yaml...........................................(no files to check)Skipped
check for added large files..............................................Passed
check for merge conflicts................................................Passed
check for broken symlinks............................(no files to check)Skipped
trim trailing whitespace.................................................Passed
fix end of files.........................................................Passed
detect private key.......................................................Passed
Check style..............................................................Failed
 - hook id: style
 - exit code: 1
 
flake8: install_deps> python -I -m pip install 'black>=22.3.0' 'flake8-bandit>=4.1.1' 'flake8-black>=0.2.3' 'flake8-bugbear>=22.8.23' 'flake8-colors>=0.1.6' 'flake8-comprehensions>=3.2.3' 'flake8-isort>=4.0.0' 'flake8-print>=5.0.0' 'flake8>=3.8.3'
flake8: commands[0]> flake8 pyabc test test_performance setup.py
Unable to find qualified name for module: setup.py
pyabc/acceptor/__init__.py:8:1: BLK100 Black would make changes.
pyabc/acceptor/acceptor.py:443:27: BLK100 Black would make changes.
pyabc/distance/distance.py:72:13: BLK100 Black would make changes.
pyabc/distance/kernel.py:2:1: BLK100 Black would make changes.
pyabc/distance/scale.py:34:1: BLK100 Black would make changes.
pyabc/predictor/predictor.py:484:13: BLK100 Black would make changes.
pyabc/storage/migrations/versions/1_20210219_add_particles_proposal_id.py:8:1: BLK100 Black would make changes.
pyabc/util/par_trafo.py:97:13: BLK100 Black would make changes.
test/base/test_samplers.py:231:69: BLK100 Black would make changes.
test_performance/test_samplerperf.py:163:69: BLK100 Black would make changes.
flake8: exit 1 (3.28 seconds) /Users/pnanda/src/pyABC> flake8 pyabc test test_performance setup.py pid=71418
  flake8: FAIL code 1 (6.92=setup[3.64]+cmd[3.28] seconds)
  evaluation failed :( (6.96 seconds)
  • The above Black-related issues don't flag the pyabc/model/model.py that I changed, so I uninstalled the commit hook to create the PR.

@codecov-commenter
Copy link

codecov-commenter commented Mar 12, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 81.65%. Comparing base (6446a77) to head (0d1305b).
Report is 235 commits behind head on develop.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop     #629      +/-   ##
===========================================
- Coverage    84.08%   81.65%   -2.44%     
===========================================
  Files           91      141      +50     
  Lines         5260     8535    +3275     
===========================================
+ Hits          4423     6969    +2546     
- Misses         837     1566     +729     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@stephanmg
Copy link
Collaborator

Thanks for the fix.

@stephanmg stephanmg merged commit 241790d into ICB-DCM:develop Mar 12, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants