Commit 1ac450f4 authored by Duggan, John's avatar Duggan, John
Browse files

Merge remote-tracking branch 'origin/main' into 70-add-component-for-selecting-datafiles-from-oncat

parents afee76d3 d317631a

CHANGELOG.md

+9 −1
Original line number Diff line number Diff line 
### nova-trame, 0.25.0

### nova-trame, 0.26.0



* Added data_source and projection parameters to NeutronDataSelector to allow populating data files from ONCat (thanks to Andrew Ayres and John Duggan).



### nova-trame, 0.25.0



* FileUpload now supports a return_contents parameter (thanks to John Duggan).



### nova-trame, 0.24.1



* Fixed literalinclude paths in the documentation (thanks to John Duggan).



### nova-trame, 0.24.0



* Parameters to DataSelector and NeutronDataSelector should now support bindings (thanks to John Duggan).

docs/api.rst

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ General Purpose Components 
    :members:

    :special-members: __new__



.. _api_remotefileinput:



.. autoclass:: nova.trame.view.components.RemoteFileInput

    :members:

    :special-members: __init__

docs/example_layouts.rst

+5 −5
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ GridLayout 
----------

By default, each item in a GridLayout will take up one row and one column. This can be changed by setting the row_span and column_span properties of the item.



.. literalinclude:: ../tests/gallery/app.py

.. literalinclude:: ../tests/gallery/views/app.py

    :start-after: grid row and column span example

    :end-before: grid row and column span example end

    :dedent:
@@ -25,7 +25,7 @@ GridLayout with whitespace 
--------------------------

Trying this with HBoxLayout or VBoxLayout will produce unpredictable behavior.



.. literalinclude:: ../tests/gallery/app.py

.. literalinclude:: ../tests/gallery/views/app.py

    :start-after: whitespace example

    :end-before: whitespace example end

    :dedent:
@@ -40,7 +40,7 @@ Result: 
HBoxLayout containing VBoxLayout

--------------------------------



.. literalinclude:: ../tests/gallery/app.py

.. literalinclude:: ../tests/gallery/views/app.py

    :start-after: mixed boxes example 1

    :end-before: mixed boxes example 1 end

    :dedent:
@@ -55,7 +55,7 @@ Result: 
VBoxLayout containing HBoxLayout

--------------------------------



.. literalinclude:: ../tests/gallery/app.py

.. literalinclude:: ../tests/gallery/views/app.py

    :start-after: mixed boxes example 2

    :end-before: mixed boxes example 2 end

    :dedent:
@@ -70,7 +70,7 @@ Result: 
GridLayout containing BoxLayouts

--------------------------------



.. literalinclude:: ../tests/gallery/app.py

.. literalinclude:: ../tests/gallery/views/app.py

    :start-after: mixed boxes example 3

    :end-before: mixed boxes example 3 end

    :dedent:

docs/working_with_trame.rst

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ If you want to customize a slot, you can either completely replace it or add chi 


If you want to add children to a slot, you can do the following:



.. literalinclude:: ../tests/gallery/app.py

.. literalinclude:: ../tests/gallery/views/app.py

    :start-after: slot child example

    :end-before: slot child example complete

    :dedent:
@@ -85,7 +85,7 @@ In order to use Vuetify helper classes in Trame, you can provide the `classes` a 


Example:



.. literalinclude:: ../tests/gallery/app.py

.. literalinclude:: ../tests/gallery/views/app.py

    :start-after: Vuetify class example start

    :end-before: Vuetify class example end

    :dedent:

pyproject.toml

+1 −1
Original line number Diff line number Diff line 
[project]

name = "nova-trame"

version = "0.25.0"

version = "0.26.0"

description = "A Python Package for injecting curated themes and custom components into Trame applications"

authors = [

    { name = "John Duggan", email = "dugganjw@ornl.gov" },