Commit 2a5aea8a authored by Yunus Sevinchan's avatar Yunus Sevinchan
Browse files

Merge branch 'install-utopya-1.3-prerelease' into 'master' 

Require utopya 1.3 pre-release

See merge request !311
parents 5bf67c6a e4942f60

README.md

+1 −1
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ The following table includes the most important Python dependencies: 


| Software                  | Version  | Comments                        |

| ------------------------- | -------- | ------------------------------- |

| [utopya](https://gitlab.com/utopia-project/utopya)   | >= 1.2   | The (outsourced) Utopia frontend package |

| [utopya](https://gitlab.com/utopia-project/utopya)   | >= 1.3   | The (outsourced) Utopia frontend package |

| [dantro](https://gitlab.com/utopia-project/dantro)   | >= 0.18  | Handle, transform, and visualize hierarchically organized data |

| [paramspace](https://gitlab.com/blsqr/paramspace)    | >= 2.5   | Makes parameter sweeps easy |

cmake/modules/UtopiaEnv.cmake

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ if (NOT PYTHON_PACKAGE_wheel_FOUND) 
endif()



# -- utopya

set(UTOPYA_REQUIRED_VERSION 1.2.0)

set(UTOPYA_REQUIRED_VERSION 1.3.0b5)



if(NOT UTOPYA_FROM_PYPI)

    set(UTOPYA_FROM_PYPI On)

doc/_cfg/SEIRD/hex_grid/eval.yml

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ _default_style: &default_style 
.flush_kind_cmap:

  to_plot:

    kind:

      limits: ~

      cmap: ~



# -----------------------------------------------------------------------------

python/utopia_base_plots.yml

+4 −0
Original line number Diff line number Diff line
@@ -108,6 +108,10 @@ _: 
# start: .plot

# -- Overloads of existing plot functions -------------------------------------



.plot.facet_grid.scatter:

  based_on: .plot.facet_grid

  kind: scatter



.plot.ca:

  based_on:

    - .plot.ca