From ef7b165704f38dc6cc8bd6fb4942c4970ae08c8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Tue, 17 Dec 2019 14:52:11 +0100 Subject: [PATCH 1/3] feat: comment out throttling --- Resources/nginx/nginx.conf | 4 ++-- config/settings.py | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/nginx/nginx.conf b/Resources/nginx/nginx.conf index a8841fe75..8346c0a69 100644 --- a/Resources/nginx/nginx.conf +++ b/Resources/nginx/nginx.conf @@ -38,7 +38,7 @@ http { server app:8000 fail_timeout=0; } - limit_req_zone $binary_remote_addr zone=api:10m rate=2r/s; + # limit_req_zone $binary_remote_addr zone=api:10m rate=2r/s; server { listen 80 deferred; @@ -72,7 +72,7 @@ http { add_header Cache-Control "public"; add_header Pragma public; - limit_req zone=api burst=10; + # limit_req zone=api burst=10; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/config/settings.py b/config/settings.py index f9a066fd7..550d06c16 100755 --- a/config/settings.py +++ b/config/settings.py @@ -127,10 +127,10 @@ 'PAGE_SIZE': 20, 'PAGINATE_BY': 20, - 'DEFAULT_THROTTLE_CLASSES': ( - 'rest_framework.throttling.AnonRateThrottle', - ), - 'DEFAULT_THROTTLE_RATES': { - 'anon': '1000/hour' - } + # 'DEFAULT_THROTTLE_CLASSES': ( + # 'rest_framework.throttling.AnonRateThrottle', + # ), + # 'DEFAULT_THROTTLE_RATES': { + # 'anon': '1000/hour' + # } } From 4a6e519b39a3324fd9c51b9ded6f127451bef050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Tue, 17 Dec 2019 17:25:50 +0100 Subject: [PATCH 2/3] feat: fix rare cases where description is ill formatted --- data/v2/build.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/data/v2/build.py b/data/v2/build.py index a4f8d543b..583d454fa 100644 --- a/data/v2/build.py +++ b/data/v2/build.py @@ -118,7 +118,11 @@ def scrub_str(string): if group[0]: sub = group[0] else: - sub = group[1].split(":")[1] + sub = group[1].split(":") + if len(sub) >= 2: + sub = sub[1] + else: + sub = sub[0] sub = sub.replace("-", " ") string = re.sub(SUB_RGX, sub, string, 1) return string From e4fe250a2683e035490219a51b935be0ba142701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alessandro=20Pezz=C3=A8?= Date: Tue, 17 Dec 2019 17:27:01 +0100 Subject: [PATCH 3/3] feat: address new max length for iso639 --- .../migrations/0004_iso639length_20191217.py | 18 ++++++++++++++++++ pokemon_v2/models.py | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 pokemon_v2/migrations/0004_iso639length_20191217.py diff --git a/pokemon_v2/migrations/0004_iso639length_20191217.py b/pokemon_v2/migrations/0004_iso639length_20191217.py new file mode 100644 index 000000000..3d81baf2b --- /dev/null +++ b/pokemon_v2/migrations/0004_iso639length_20191217.py @@ -0,0 +1,18 @@ +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('pokemon_v2', '0003_auto_20160530_1132'), + ] + + operations = [ + migrations.AlterField( + model_name='language', + name='iso639', + field=models.CharField(max_length=10), + preserve_default=True, + ), + + ] diff --git a/pokemon_v2/models.py b/pokemon_v2/models.py index 9496b1511..dc93eb49d 100755 --- a/pokemon_v2/models.py +++ b/pokemon_v2/models.py @@ -499,7 +499,7 @@ class VersionGroupMoveLearnMethod(HasVersionGroup, HasMoveLearnMethod): class Language(HasName, HasOrder): - iso639 = models.CharField(max_length=2) + iso639 = models.CharField(max_length=10) iso3166 = models.CharField(max_length=2)