Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix failing shape selection process #223

Merged
merged 7 commits into from
Mar 31, 2020
Merged

Fix failing shape selection process #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1166757
Revert bad write format
Zeitsperre Mar 23, 2020
ad3863c
Add salem and some small changes to facilitate notebooks passing tests
Zeitsperre Mar 23, 2020
b538f99
Added temporary case for shape_url in format of bytes
Zeitsperre Mar 23, 2020
31e191e
Fix `wb` flag condition and notebook errors
Zeitsperre Mar 25, 2020
3dafedd
Blacken and PEP8 wps_raven_hbv_ec.py
Zeitsperre Mar 25, 2020
1ddc369
Merge branch 'master' into fix_failing_shape_select
Zeitsperre Mar 30, 2020
a698a83
Make test_nb output verbose
Zeitsperre Mar 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ test_nb:
@echo "Running notebook-based tests"
@bash -c "source $(ANACONDA_HOME)/bin/activate $(CONDA_ENV)"
@bash -c "curl -L https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/raw/master/notebooks/output-sanitize.cfg --output $(CURDIR)/docs/source/output_sanitize.cfg --silent"
@bash -c "env RAVEN_WPS_URL=$(RAVEN_WPS_URL) FLYINGPIGEON_WPS_URL=$(FLYINGPIGEON_WPS_URL) pytest --nbval $(CURDIR)/docs/source/notebooks/ --sanitize-with $(CURDIR)/docs/source/output_sanitize.cfg --ignore $(CURDIR)/docs/source/notebooks/.ipynb_checkpoints"
@bash -c "env RAVEN_WPS_URL=$(RAVEN_WPS_URL) FLYINGPIGEON_WPS_URL=$(FLYINGPIGEON_WPS_URL) pytest --nbval --verbose $(CURDIR)/docs/source/notebooks/ --sanitize-with $(CURDIR)/docs/source/output_sanitize.cfg --ignore $(CURDIR)/docs/source/notebooks/.ipynb_checkpoints"

# .PHONY: test-notebooks
# test-notebooks:
Expand Down
142 changes: 52 additions & 90 deletions docs/source/notebooks/Delineation_workflow.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions docs/source/notebooks/Perform_Regionalization.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
" \n",
" Parameters\n",
" ----------\n",
" ts : ComplexData:mimetype:`application/x-netcdf`, :mimetype:`text/plain`, :mimetype:`application/x-zipped-shp`\n",
" ts : ComplexData:mimetype:`application/x-netcdf`, :mimetype:`application/x-ogc-dods`, :mimetype:`text/plain`, :mimetype:`application/x-zipped-shp`\n",
" Files (text or netCDF) storingdaily liquid precipitation (pr), solid precipitation (prsn), minimum temperature (tasmin), maximum temperature (tasmax), potential evapotranspiration (evspsbl) and observed streamflow (qobs [m3/s]).\n",
" start_date : dateTime\n",
" Start date of the simulation (AAAA-MM-DD). Defaults to the start of the forcing file.\n",
Expand Down Expand Up @@ -217,7 +217,7 @@
{
"data": {
"text/plain": [
"[<matplotlib.lines.Line2D at 0x7fe7e4338ba8>]"
"[<matplotlib.lines.Line2D at 0x7f8cdccf2e80>]"
]
},
"execution_count": 6,
Expand Down Expand Up @@ -298,11 +298,11 @@
{
"data": {
"text/plain": [
"[<matplotlib.lines.Line2D at 0x7fe7e0948128>,\n",
" <matplotlib.lines.Line2D at 0x7fe7e02af278>,\n",
" <matplotlib.lines.Line2D at 0x7fe7e02af400>,\n",
" <matplotlib.lines.Line2D at 0x7fe7e02af550>,\n",
" <matplotlib.lines.Line2D at 0x7fe7e02af6a0>]"
"[<matplotlib.lines.Line2D at 0x7f8cdcc3d4a8>,\n",
" <matplotlib.lines.Line2D at 0x7f8cdc5367f0>,\n",
" <matplotlib.lines.Line2D at 0x7f8cdc536978>,\n",
" <matplotlib.lines.Line2D at 0x7f8cdc536ac8>,\n",
" <matplotlib.lines.Line2D at 0x7f8cdc536c18>]"
]
},
"execution_count": 8,
Expand Down Expand Up @@ -344,7 +344,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.6.7"
"version": "3.6.10"
}
},
"nbformat": 4,
Expand Down
28 changes: 14 additions & 14 deletions docs/source/notebooks/Region_selection.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
{
"cell_type": "code",
"execution_count": 9,
"execution_count": 1,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -34,7 +34,7 @@
},
{
"cell_type": "code",
"execution_count": 10,
"execution_count": 2,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -48,7 +48,7 @@
},
{
"cell_type": "code",
"execution_count": 11,
"execution_count": 3,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -74,7 +74,7 @@
},
{
"cell_type": "code",
"execution_count": 12,
"execution_count": 4,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -99,18 +99,18 @@
},
{
"cell_type": "code",
"execution_count": 13,
"execution_count": 5,
"metadata": {},
"outputs": [
{
"data": {
"application/vnd.jupyter.widget-view+json": {
"model_id": "56b9407a1406435ca4bdb3103e28a373",
"model_id": "ae337c54fadd42699aae3c132c9a70de",
"version_major": 2,
"version_minor": 0
},
"text/plain": [
"Map(basemap={'url': 'https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png', 'max_zoom': 17, 'attribution': 'Map da…"
"Map(center=[48.63, -74.71], controls=(ZoomControl(options=['position', 'zoom_in_text', 'zoom_in_title', 'zoom_…"
]
},
"metadata": {},
Expand All @@ -133,7 +133,7 @@
},
{
"cell_type": "code",
"execution_count": 14,
"execution_count": 6,
"metadata": {},
"outputs": [
{
Expand All @@ -142,7 +142,7 @@
"[-74.71, 48.63]"
]
},
"execution_count": 14,
"execution_count": 6,
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -154,13 +154,13 @@
},
{
"cell_type": "code",
"execution_count": 15,
"execution_count": 7,
"metadata": {},
"outputs": [
{
"data": {
"application/vnd.jupyter.widget-view+json": {
"model_id": "c78d6074ba3d4bccaa04a7f905d88177",
"model_id": "d8b8a69483df42079009b154c35b87bf",
"version_major": 2,
"version_minor": 0
},
Expand All @@ -180,7 +180,7 @@
},
{
"cell_type": "code",
"execution_count": 16,
"execution_count": 8,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -198,7 +198,7 @@
},
{
"cell_type": "code",
"execution_count": 17,
"execution_count": 9,
"metadata": {},
"outputs": [],
"source": [
Expand Down Expand Up @@ -240,7 +240,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.6.7"
"version": "3.6.10"
}
},
"nbformat": 4,
Expand Down
35 changes: 17 additions & 18 deletions docs/source/notebooks/canopex.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

Loading