Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: quaquel/EMAworkbench
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.4.0
Choose a base ref
...
head repository: quaquel/EMAworkbench
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2.4.1
Choose a head ref
  • 11 commits
  • 20 files changed
  • 3 contributors

Commits on Jun 18, 2023

  1. readthedocs: Add search ranking and use latest Python version (#242) 

    * readthedocs: Add search ranking and use latest Python version

Add a ranking which search results should pop up first (proposed docs/source > ema_workbench/examples > ema_workbench > everything else > all models).

See https://docs.readthedocs.io/en/stable/config-file/v2.html#search

Also always use latest stable Python version.

* docs: sphinx-rtd-theme as optional dep, specify needs_sphinx

- Set sphinx-rtd-theme as optional docs dependency
- Specify needs_sphinx and needs_extensions in the conf.py configuration file (see https://www.sphinx-doc.org/en/master/usage/configuration.html#confval-needs_sphinx)

* Update .readthedocs.yaml

Try something else to set the docs requirements

* Update .readthedocs.yaml

* readthedocs-sphinx-ext update

* Attempt to fix search by using requirements.txt

* Add general requirements to docs

* docs: conf.py: Implement search workaround

Implement a workaround to get search working again

readthedocs/sphinx_rtd_theme#1452 (comment)

---------

Co-authored-by: Jan Kwakkel <[email protected]>
    @EwoutH @quaquel
    EwoutH and quaquel committed Jun 18, 2023
    Configuration menu
    Copy the full SHA
    b86084d View commit details
    Browse the repository at this point in the history

  2. Fix search in Readthedocs configuration with workaround (#264) 

    This commit fixes search by adding a workaround to the Readthedocs configuration.

For the workaround see readthedocs/sphinx_rtd_theme#1452 (comment)
    @EwoutH
    EwoutH committed Jun 18, 2023
    Configuration menu
    Copy the full SHA
    8df0054 View commit details
    Browse the repository at this point in the history

  3. bugfix introduced by #241 in general-introduction from docs (#265) 

    #241 ensured that categorical uncertainties were properly handled in the experiment dataframe. The general introduction used an outdated fix for the same problem.
    @quaquel @EwoutH
    quaquel authored and EwoutH committed Jun 18, 2023
    Configuration menu
    Copy the full SHA
    17935fd View commit details
    Browse the repository at this point in the history

  4. [pre-commit.ci] pre-commit autoupdate (#267) 

    updates:
- [github.com/asottile/pyupgrade: v3.3.1 → v3.4.0](asottile/pyupgrade@v3.3.1...v3.4.0)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
    @pre-commit-ci @EwoutH
    pre-commit-ci[bot] authored and EwoutH committed Jun 18, 2023
    Configuration menu
    Copy the full SHA
    3e8692c View commit details
    Browse the repository at this point in the history

  5. prim: Replace deprecated Altair function (#270) 

    * prim: Replace deprecated Altair function

Replace altair.selection_single() with altair.selection_point(), since the former is deprecated in Altair 5.0.0.

* prim: Fix Altair chart by using Chart().add_selection()

Fix the Altair Chart used in inspect_tradeoff(), by using Chart().add_selection() instead of the removed Chart().properties(selector=). This fixed the inspect_tradeoff() when using Altair 5.0.0.

* prim: Update deprecated Chart.add_selection() to .add_params()

See https://altair-viz.github.io/releases/changes.html#grammar-changes
    @EwoutH
    EwoutH committed Jun 18, 2023
    Configuration menu
    Copy the full SHA
    57a4959 View commit details
    Browse the repository at this point in the history

  6. [pre-commit.ci] pre-commit autoupdate (#275) 

    updates:
- [github.com/asottile/pyupgrade: v3.4.0 → v3.6.0](asottile/pyupgrade@v3.4.0...v3.6.0)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
    @pre-commit-ci @EwoutH
    pre-commit-ci[bot] authored and EwoutH committed Jun 18, 2023
    Configuration menu
    Copy the full SHA
    8b8d22c View commit details
    Browse the repository at this point in the history

  7. docs/examples: Always use n_processes=-1 in MultiprocessingEvaluator (#… 

    …278)

* docs/examples: Always use n_processes=-1 in MultiprocessingEvaluator

Modify the docs and examples to always use n_processes=-1 in MultiprocessingEvaluator. This ensure that when a user runs them, they always use most of their cores while keeping one core available for background tasks and to keep the system responsive.

* docs/tutorial: Add comments
    @EwoutH
    EwoutH committed Jun 18, 2023
    Configuration menu
    Copy the full SHA
    8ac8885 View commit details
    Browse the repository at this point in the history

  8. bugfix to rebuild_platypus_population (#276) 

    * bugfix to rebuild_platypus_population

decision variables are now properly encoded using the underlying platypus datatypes

* some additional exceptions are now raised

* Update ema_workbench/em_framework/optimization.py

Co-authored-by: Ewout ter Hoeven <[email protected]>

* Update ema_workbench/em_framework/optimization.py

Co-authored-by: Ewout ter Hoeven <[email protected]>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: Ewout ter Hoeven <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
    @quaquel @EwoutH @pre-commit-ci
    3 people committed Jun 18, 2023
    Configuration menu
    Copy the full SHA
    3ce0c9c View commit details
    Browse the repository at this point in the history

  9. Raise exception sampling scenarios/policies while no uncertainties/le… 

    …vers are defined (#282)

raise exception when sampling scenarios or policies while no uncertainties or levers are defined.
    @quaquel @EwoutH
    quaquel authored and EwoutH committed Jun 18, 2023
    Configuration menu
    Copy the full SHA
    ae1b657 View commit details
    Browse the repository at this point in the history

  10. Let save_/load_results() properly handles experiments dtypes (#280) 

    * bugfix for #277 : load_results now casts all columns in experiments to dtype as specified in metadata

bugfix for load_results. In parsing experiments, the dtype metadata is now correctly applied.  Also expands save)results unittest to cover all dtypes used in storing experiments.

* small typo in test
    @quaquel @EwoutH
    quaquel authored and EwoutH committed Jun 18, 2023
    Configuration menu
    Copy the full SHA
    01abd6c View commit details
    Browse the repository at this point in the history

  11. Update changelog and init.py for 2.4.1 release

    @EwoutH
    EwoutH committed Jun 18, 2023
    Configuration menu
    Copy the full SHA
    e79f9b9 View commit details
    Browse the repository at this point in the history
Loading