Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
12rambau committed Oct 6, 2021
2 parents f1d60fc + 952627c commit 67757ae
Show file tree
Hide file tree
Showing 39 changed files with 1,642 additions and 645 deletions.
2 changes: 1 addition & 1 deletion .cz.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ commitizen:
changelog_file: CHANGELOG.md
tag_format: v_$major.$minor.$patch$prerelease
update_changelog_on_bump: false
version: 2.2.1
version: 2.3.0
version_files:
- setup.py:version
- sepal_ui/__init__.py:__version__
2 changes: 1 addition & 1 deletion .github/workflows/unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: pip install -r requirements.txt
- name: Test formatting
uses: psf/black@stable
- name: test with unittest
- name: test with pytest
run: coverage run -m pytest --color=yes tests
- name: coverage
run: coverage report -m
Expand Down
67 changes: 38 additions & 29 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
## v_2.3.0 (2021-10-06)

### Fix

- add enforce_aoi to reclassify_model
- use split instead of indexing Fix #302
- prevent tooltip error when calling. closes #298
- little typo
- fiix some minor bugs and add human sorted

### Refactor

- create destination gee unique name before export
- move exceptions from view to model
- remove _chk_dst_file method, its process was duplicated in the _set_dst_class file method

### Feat

- new script to Create a string followed by a consecutive underscore and number
- test reclassify model coverage=80%
- create useful fixtures to implement in related tests.
- create a tests rasters to test reclassify methods

## v_2.2.1 (2021-09-30)

### Fix
Expand All @@ -15,29 +38,9 @@
- catch when on_widget and targets have different length
- get the widget instead of the widget name
- local variable referenced before assignment

### Refactor

- renamed Clip -> CopyToClip
- only set targets at the begining
- use switch decorator
- make all view children elements part of the View class

### Feat

- add copy-to-clipboard widget
- add a target parameter in the switch method

## v_2.1.1 (2021-09-15)

### Fix

- **docs**: fix typo
- include the save parameter to the view when someones initialize the view without the model
- typo in setup

## v_2.1.0 (2021-09-15)

### Fix

- folder init in reclassifyTile
- typo in json dict
- display the btn at the bottom of the table
Expand All @@ -53,6 +56,12 @@

### Refactor

- remove un-used method
- renamed Clip -> CopyToClip
- only set targets at the begining
- create a state bar to control if a table is already created
- use switch decorator
- make all view children elements part of the View class
- **lang**: add keys
- remove test notebook
- ensure a value is set to the func
Expand All @@ -75,6 +84,12 @@

### Feat

- declare all variable
- add copy-to-clipboard widget
- create common used fixtures
- test reclassify model
- add a target parameter in the switch method
- create validation for the reclassify model method
- change state when something is loaded
- test asset validity
- add commitizen check
Expand All @@ -83,12 +98,6 @@
- define default_asset trait in SelectAsset. it will accept whether strings for unique default assets or lists for multiple. The trait can be observed to update the list anytime
- introducing switch decorator

## v_2.0.6 (2021-06-22)

## v_2.0.5 (2021-06-17)

## v_2.0.4 (2021-06-15)

## v_2.0.3 (2021-06-09)

## v_2.0.2 (2021-06-08)
Expand Down Expand Up @@ -167,4 +176,4 @@

## v_0.1-alpha (2020-07-27)

## v_0.0-alpha (2020-07-27)
## v_0.0-alpha (2020-07-27)
8 changes: 7 additions & 1 deletion CONTRIBUTE.rst
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,13 @@ In the files change the version number by runnning commitizen `bump`:
cz bump
It should modify for you the version number in :code:`sepal_ui/__init__.py`, :code:`setup.py`, and :code:`.cz.yaml` according to sementic versionning thanks to the conventional commit that we use in the lib. It will also update the :code:`CHANGELOG.md` file with the latest commits, sorted by categories.
It should modify for you the version number in :code:`sepal_ui/__init__.py`, :code:`setup.py`, and :code:`.cz.yaml` according to sementic versionning thanks to the conventional commit that we use in the lib.

It will also update the :code:`CHANGELOG.md` file with the latest commits, sorted by categories if you run the following code, using the version bumped in the previous commit.

.. code-block:: console
cz changelog --unreleased-version="v_x.x.x"
Then push the current :code:`master` branch to the :code:`release` branch. You can now create a new tag with your new version number. use the same convention as the one found in :code:`.cz.yaml`: :code:`v_$minor.$major.$patch$prerelease`.

Expand Down
7 changes: 4 additions & 3 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@

.. image:: https://raw.githubusercontent.com/openforis/sepal-doc/master/docs/source/img/sepal_header.png

sepal-ui
SEPAL-UI
========

Sepal_ui is a lib designed to create elegant dashboard in the Sepal environment. It is designed on top of the amazing ipyvuetify and will help developer to easily create interfaces for their workflows.
By using this library, you'll ensure a robust and unified interface for your scripts and a easy and complete integration into the sepal dashboard of application.
SEPAL-UI is a lib designed to create an elegant dashboard in the Sepal environment. It is designed on top of the amazing ipyvuetify widget library and will help the developer to easily create interfaces for their workflows. By using this library, you’ll ensure a robust and unified interface for your scripts and an easy and complete integration into the SEPAL apps dashboard.

We are happy to receive feedback and we welcome any kind of contribution.

.. note:: The following sections will cover the SEPAL_UI framework, if you are looking for the SEPAL platform documentation, please go to this `link <https://docs.sepal.io/en/latest/index.html>`_.

Table of content
================

Expand Down
2 changes: 1 addition & 1 deletion sepal_ui/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

__author__ = """Pierrick Rambaud"""
__email__ = "[email protected]"
__version__ = "2.2.1"
__version__ = "2.3.0"

# direct access to colors
from sepal_ui.frontend import styles
Expand Down
57 changes: 57 additions & 0 deletions sepal_ui/aoi/Untitled.ipynb
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"cells": [
{
"cell_type": "code",
"execution_count": 3,
"id": "8ab04508-9ea5-4565-b0a6-8fd40cfdee01",
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
"7"
]
},
"execution_count": 3,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"a = 0\n",
"b = 7\n",
"\n",
"a or b"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "1c0b468e-e3df-426a-8eff-1eb6ad731326",
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
"kernelspec": {
"display_name": "Python 3",
"language": "python",
"name": "python3"
},
"language_info": {
"codemirror_mode": {
"name": "ipython",
"version": 3
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.8.10"
}
},
"nbformat": 4,
"nbformat_minor": 5
}
2 changes: 1 addition & 1 deletion sepal_ui/aoi/aoi_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def __init__(
self.ee = gee
if gee:
su.init_ee()
self.folder = folder if folder else ee.data.getAssetRoots()[0]["id"]
self.folder = folder or ee.data.getAssetRoots()[0]["id"]

# outputs of the selection
self.gdf = None
Expand Down
2 changes: 2 additions & 0 deletions sepal_ui/reclassify/parameters.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
from sepal_ui.message import ms

__all__ = ["MATRIX_NAMES", "TABLE_NAMES", "NO_VALUE", "SCHEMA"]

MATRIX_NAMES = ["src", "dst"]
TABLE_NAMES = ["code", "desc", "color"]

Expand Down
Loading

0 comments on commit 67757ae

Please sign in to comment.