From edfc73ac1d024edabb1a5ad481e7bc1fb6b29960 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Wed, 7 Apr 2021 09:00:53 +0200
Subject: [PATCH] template changes
---
setup.py | 6 +++---
src/covid19/blueprints/owid/owid_views.py | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/setup.py b/setup.py
index 8d25f3e1..0b8e5271 100644
--- a/setup.py
+++ b/setup.py
@@ -62,7 +62,7 @@ requires_setup = [
"requests==2.25.1",
"six==1.15.0",
"toml==0.10.2",
- "urllib3==1.26.3",
+ "urllib3>=1.26.4",
"venv-run==0.1.0",
"virtualenv-clone==0.5.4",
"virtualenv==20.4.3",
@@ -158,7 +158,7 @@ requires_docs = [
"sphinxcontrib-serializinghtml==1.1.4",
"tokenize-rt==4.1.0",
"uritemplate==3.0.1",
- "urllib3==1.26.3",
+ "urllib3>=1.26.4",
]
dotenv_require = [
@@ -311,7 +311,7 @@ requires_install = [
"tornado==6.1",
"typing-extensions==3.7.4.3",
"uritemplate==3.0.1",
- "urllib3==1.26.3",
+ "urllib3>=1.26.4",
"venv-run==0.1.0",
"vine==5.0.0",
"virtualenv-clone==0.5.4",
diff --git a/src/covid19/blueprints/owid/owid_views.py b/src/covid19/blueprints/owid/owid_views.py
index d36530d7..61ac218a 100644
--- a/src/covid19/blueprints/owid/owid_views.py
+++ b/src/covid19/blueprints/owid/owid_views.py
@@ -351,7 +351,7 @@ def url_owid_date_reported_one_deaths_cumulative(date_reported_id: int, page: in
def url_owid_continent_all(page: int = 1):
page_info = ApplicationPage(
"Continents "
- 'OWID'
+ 'OWID', 'all'
)
try:
page_data = OwidContinent.get_all_as_page(page)
@@ -390,7 +390,7 @@ def url_owid_continent_one(continent_id: int, page: int = 1):
def url_owid_country_all(page: int = 1):
page_info = ApplicationPage(
"Countries "
- 'OWID'
+ 'OWID', 'all'
)
try:
page_data = OwidCountry.get_all_as_page(page)
@@ -410,7 +410,7 @@ def url_owid_country_one(country_id: int, page: int = 1):
page_info = ApplicationPage(
"country: " + owid_country_one.location,
'OWID',
- "data for OWID continent " + owid_country_one.continent.region + " "
+ "on continent " + owid_country_one.continent.region + " "
)
try:
page_data = OwidData.get_data_for_country(owid_country_one, page)
@@ -431,7 +431,7 @@ def url_owid_country_one_germany(page: int = 1):
page_info = ApplicationPage(
"country: " + owid_country_one.location,
'OWID',
- "data for OWID continent " + owid_country_one.continent.region + " "
+ "on continent " + owid_country_one.continent.region + " "
)
try:
page_data = OwidData.get_data_for_country(owid_country_one, page)
--
GitLab