Merge pull request #64 from geoadmin/bug-bgdiinf-sb-3129-randomize

ltflb-bgdi · web-flow · commit 19c1eb00556f · 2023-11-13T16:08:05.000+01:00
BGDIINF_SB-3129: Fixed dockerfile and validators version
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.9-slim-buster
+FROM python:3.11-slim-buster
 RUN groupadd -r geoadmin && useradd -r -s /bin/false -g geoadmin geoadmin
 
 
diff --git a/Pipfile b/Pipfile
@@ -6,12 +6,12 @@ name = "pypi"
 [packages]
 boto3 = "~=1.28"
 logging-utilities = "~=4.0"
-Flask = "~=3.0"
+Flask = "~=3.0.0"
 gevent = "~=23.9"
 gunicorn = "~=21.2"
 PyYAML = "~=6.0"
 python-dotenv = "~=1.0"
-validators = "~=0.22"
+validators = "==0.20" # breaking change in 0.21 and 0.22 (# in url path). To be fixed in >=0.23
 nanoid = "~=2.0"
 
 [dev-packages]
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/tests/unit_tests/test_routes.py b/tests/unit_tests/test_routes.py
@@ -25,7 +25,7 @@ def test_checker_ok(self):
         self.assertEqual(response.json, {'success': True, 'message': 'OK', 'version': APP_VERSION})
 
     def test_create_shortlink_ok(self):
-        url = "https://map.geo.admin.ch/test"
+        url = "https://map.geo.admin.ch/#/map?lang=en&center=2647850.83,1120124.2&z=1.812&bgLayer=ch.swisstopo.pixelkarte-farbe&top"  # pylint: disable=line-too-long
         response = self.app.post(
             url_for('create_shortlink'), json={"url": url}, headers={"Origin": "map.geo.admin.ch"}
         )

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM python:3.9-slim-buster`
	`1`	`+FROM python:3.11-slim-buster`
`2`	`2`	`RUN groupadd -r geoadmin && useradd -r -s /bin/false -g geoadmin geoadmin`
`3`	`3`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ def test_checker_ok(self):`
`25`	`25`	`self.assertEqual(response.json, {'success': True, 'message': 'OK', 'version': APP_VERSION})`
`26`	`26`
`27`	`27`	`def test_create_shortlink_ok(self):`
`28`		`- url = "https://map.geo.admin.ch/test"`
	`28`	`+ url = "https://map.geo.admin.ch/#/map?lang=en&center=2647850.83,1120124.2&z=1.812&bgLayer=ch.swisstopo.pixelkarte-farbe&top" # pylint: disable=line-too-long`
`29`	`29`	`response = self.app.post(`
`30`	`30`	`url_for('create_shortlink'), json={"url": url}, headers={"Origin": "map.geo.admin.ch"}`
`31`	`31`	`)`