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 Jun 15, 2021
2 parents 9044a0b + be9cb77 commit 412c28f
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 11 deletions.
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
author = 'Pierrick Rambaud'

# The full version, including alpha/beta/rc tags
release = '2.0.3'
release = '2.0.4'


# -- General configuration ---------------------------------------------------
Expand Down
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,5 @@ nbsphinx
pandoc
ipykernel
sphinx-copybutton
sepal_ui
sepal_ui
natsort
2 changes: 1 addition & 1 deletion sepal_ui/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
__author__ = """Pierrick Rambaud"""
__email__ = "[email protected]"
__version__ = "2.0.3"
__version__ = "2.0.4"

# direct access to colors
from sepal_ui.frontend import styles
Expand Down
2 changes: 2 additions & 0 deletions sepal_ui/mapping/mapping.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ class SepalMap(geemap.Map):

def __init__(self, basemaps=[], dc=False, vinspector=False, gee=True, **kwargs):

self.world_copy_jump=True

# Init the map
super().__init__(
ee_initialize = False, # we take care of the initialization on our side
Expand Down
7 changes: 4 additions & 3 deletions sepal_ui/sepalwidgets/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -331,8 +331,9 @@ def show_tile(self, name):

# activate the drawerItem
if self.navDrawer:
for i in self.navDrawer.items:
if name == i._metadata['card_id']:
i.input_value = True
items = (i for i in self.navDrawer.items if i._metadata != None)
for i in items:
if name == i._metadata['card_id']:
i.input_value = True

return self
5 changes: 3 additions & 2 deletions sepal_ui/sepalwidgets/inputs.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import pandas as pd
import ee
import geopandas as gpd
from natsort import humansorted

from sepal_ui.frontend.styles import *
from sepal_ui.scripts import utils as su
Expand Down Expand Up @@ -273,8 +274,8 @@ def _get_items(self):
children.append(v.ListItemActionText(children=[file_size]))
file_list.append(v.ListItem(value=str(el), children=children))

folder_list = sorted(folder_list, key=lambda x: x.value)
file_list = sorted(file_list, key=lambda x: x.value)
folder_list = humansorted(folder_list, key=lambda x: x.value)
file_list = humansorted(file_list, key=lambda x: x.value)

parent_item = v.ListItem(
value=str(folder.parent),
Expand Down
7 changes: 4 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
'sepal_ui.model'
],
package_data={'sepal_ui': ['scripts/*.csv', 'scripts/*.md', 'message/*.json', 'bin/module_factory']},
version = '2.0.3',
version = '2.0.4',
license='MIT',
description = 'Wrapper for ipyvuetify widgets to unify the display of voila dashboards in SEPAL platform',
long_description = open('README.rst').read(),
long_description_content_type = 'text/x-rst',
author = 'Pierrick Rambaud',
author_email = '[email protected]',
url = 'https://github.com/12rambau/sepal_ui',
download_url = 'https://github.com/12rambau/sepal_ui/archive/v_2.0.3.tar.gz',
download_url = 'https://github.com/12rambau/sepal_ui/archive/v_2.0.4.tar.gz',
keywords = ['UI', 'Python', 'widget', 'sepal'],
install_requires=[
'haversine',
Expand All @@ -37,7 +37,8 @@
'deepdiff',
'colorama',
'Deprecated',
'Unidecode'
'Unidecode',
'natsort'
],
classifiers=[
'Development Status :: 5 - Production/Stable',
Expand Down

0 comments on commit 412c28f

Please sign in to comment.