瀏覽代碼

Upgrade Microdot tests to Python 3.11 (#7982)

Miguel Grinberg 2 年之前
父節點
當前提交
e1675412b8

+ 2 - 5
frameworks/Python/microdot/app_async.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 from datetime import datetime
 import os
-from random import randint
+from random import randint, sample
 
 from alchemical.aio import Alchemical
 import sqlalchemy as sqla
@@ -52,10 +52,7 @@ def get_num_queries(request, name="queries"):
 
 
 def generate_ids(num_queries):
-    ids = {randint(1, 10000) for _ in range(num_queries)}
-    while len(ids) < num_queries:
-        ids.add(randint(1, 10000))
-    return list(ids)
+    return sample(range(1, 10001), num_queries)
 
 
 @app.route("/json")

+ 2 - 5
frameworks/Python/microdot/app_async_raw.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 from datetime import datetime
 import os
-from random import randint
+from random import randint, sample
 
 import asyncpg
 from asyncache import cached
@@ -45,10 +45,7 @@ def get_num_queries(request, name="queries"):
 
 
 def generate_ids(num_queries):
-    ids = {randint(1, 10000) for _ in range(num_queries)}
-    while len(ids) < num_queries:
-        ids.add(randint(1, 10000))
-    return list(ids)
+    return sample(range(1, 10001), num_queries)
 
 
 @app.route("/json")

+ 2 - 5
frameworks/Python/microdot/app_sync.py

@@ -2,7 +2,7 @@
 from datetime import datetime
 from functools import lru_cache
 import os
-from random import randint
+from random import randint, sample
 
 from alchemical import Alchemical
 import sqlalchemy as sqla
@@ -53,10 +53,7 @@ def get_num_queries(request, name="queries"):
 
 
 def generate_ids(num_queries):
-    ids = {randint(1, 10000) for _ in range(num_queries)}
-    while len(ids) < num_queries:
-        ids.add(randint(1, 10000))
-    return list(ids)
+    return sample(range(1, 10001), num_queries)
 
 
 @app.route("/json")

+ 2 - 5
frameworks/Python/microdot/app_sync_raw.py

@@ -2,7 +2,7 @@
 from datetime import datetime
 from functools import lru_cache
 import os
-from random import randint
+from random import randint, sample
 
 from microdot_wsgi import Microdot
 from microdot_jinja import render_template
@@ -36,10 +36,7 @@ def get_num_queries(request, name="queries"):
 
 
 def generate_ids(num_queries):
-    ids = {randint(1, 10000) for _ in range(num_queries)}
-    while len(ids) < num_queries:
-        ids.add(randint(1, 10000))
-    return list(ids)
+    return sample(range(1, 10001), num_queries)
 
 
 @app.route("/json")

+ 1 - 1
frameworks/Python/microdot/microdot-async-raw.dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.8-buster
+FROM python:3.11-buster
 
 RUN apt-get update
 RUN apt-get install libpq-dev python3-dev -y

+ 1 - 1
frameworks/Python/microdot/microdot-async.dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.8-buster
+FROM python:3.11-buster
 
 RUN apt-get update
 RUN apt-get install libpq-dev python3-dev -y

+ 1 - 1
frameworks/Python/microdot/microdot-raw.dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.8-buster
+FROM python:3.11-buster
 
 RUN apt-get update
 RUN apt-get install libpq-dev python3-dev -y

+ 1 - 2
frameworks/Python/microdot/microdot.dockerfile

@@ -1,5 +1,4 @@
-FROM python:3.8-buster
-
+FROM python:3.11-buster
 
 RUN apt-get update
 RUN apt-get install libpq-dev python3-dev -y

+ 2 - 2
frameworks/Python/microdot/requirements.txt

@@ -7,6 +7,6 @@ cachetools
 asyncache
 
 alchemical
-microdot
+microdot<2
 gunicorn
-uvicorn
+uvicorn[standard]