Skip to content

Commit

Permalink
compensate v1.6
Browse files Browse the repository at this point in the history
  • Loading branch information
loriab committed Oct 6, 2024
1 parent 4613cc7 commit 44ac0a6
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 5 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,12 @@ jobs:
run: |
sed -i s/from\ pydantic\ /from\ pydantic.v1\ /g ${CONDA_PREFIX}/lib/python${{ matrix.cfg.python-version }}/site-packages/psi4/driver/*py
- name: Special Config - Forced Interface Upgrade
if: "(matrix.cfg.label == 'Psi4-1.6')"
run: |
grep -r "local_options" ${CONDA_PREFIX}/lib/python${{ matrix.cfg.python-version }}/site-packages/psi4/driver/
sed -i "s/local_options/task_config/g" ${CONDA_PREFIX}/lib/python${{ matrix.cfg.python-version }}/site-packages/psi4/driver/procrouting/*py
- name: Install QCEngine
run: |
python -m pip install . --no-deps
Expand Down
17 changes: 12 additions & 5 deletions docs/source/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,17 @@ Breaking Changes
- (:pr:`453`) Deps - Require pydantic v2 dependency (don't worry, this isn't
changing QCEngine's role as QCSchema I/O runner. Also require pydantic-settings
for CLI. @loriab
* as promised, `local_options` has been removed in favor of `task_config`.
* compute and compute_procedure have been merged in favor of the former.
* `compute` learned an optional argument `return_version` to specify the schema_version of the
returned model or dictionary. By default it'll return the input schema_version. If not
determinable, will return v1. @loriab
- (:pr:`455`) API - As promised 2 years ago for >=v0.30, `local_options` has
been removed in favor of `task_config` in `compute` and `compute_procedure`.
Note that Psi4 v1.6 will need an older qcel or a sed to work (see GHA). The
`qcengine.MDIEngine` is on notice (probably not user-facing. @loriab
- (:pr:`455`) API - `qcengine.compute` and `qcengine.compute_procedure` have been
merged in favor of the former. Also, treat the second argument (e.g., "nwchem"
or "geometric") as a positional argument, rather than keyword argument with key
"program" or "procedure". @loriab
- (:pr:`455`) API - `compute` learned an optional argument `return_version` to
specify the schema_version of the returned model or dictionary. By default it'll
return the input schema_version. If not determinable, it will return v1. @loriab

New Features
++++++++++++
Expand All @@ -50,6 +56,7 @@ Enhancements
- (:pr:`453`) Maint - Convert internal (non-QCSchema) pydantic classes to
pydantic v2 API, namely `NodeDescriptor`, `TaskConfig`, `ProgramHarness`,
`ProcedureHarness`. @loriab
- (:pr:`454`) Testing - Tests check QCSchema v1 and v2. @loriab

Bug Fixes
+++++++++
Expand Down
1 change: 1 addition & 0 deletions qcengine/compute.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ def compute(
The number of random tries to retry for.
task_config
A dictionary of local configuration options corresponding to a TaskConfig object.
Formerly local_options.
return_dict
Returns a dict instead of qcelemental.models.AtomicResult # TODO base Result class
return_version
Expand Down

0 comments on commit 44ac0a6

Please sign in to comment.