Merge pull request #420 from SELab-2/dependabot/pip/backend/develop/p…

…ip-23.1.2 Bump pip from 23.0.1 to 23.1.2 in /backend
SELab-2 · May 11, 2023 · 54afca2 · 54afca2
2 parents 0101835 + 43786db
commit 54afca2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -20,14 +20,14 @@ jobs:
 
       - name: 'Create .env file'
         run: |
-          echo ${{ secrets.ENV_FILE }} > .env
+          echo "secrets.ENV_FILE" > .env
 
       - name: Build Docker
         run: docker-compose --env-file .env build
 
       - name: Run Tests
         run: |
-          docker-compose run --name backend_test backend python manage.py test picture_of_remark/tests.py users/tests.py remark_at_building/tests.py lobby/tests.py email_template/tests.py building/tests.py role/tests.py building_comment/tests.py building_on_tour/tests.py garbage_collection/tests.py manual/tests.py region/tests.py tour/tests.py --with-coverage --cover-package=lobby,email_template,building,building_on_tour,garbage_collection,manual,region,tour,building_comment,role,remark_at_building,picture_of_remark,users --with-xunit --xunit-file=/app/coverage.xml
+          docker-compose run --env-file .env --name backend_test backend python manage.py test picture_of_remark/tests.py users/tests.py remark_at_building/tests.py lobby/tests.py email_template/tests.py building/tests.py role/tests.py building_comment/tests.py building_on_tour/tests.py garbage_collection/tests.py manual/tests.py region/tests.py tour/tests.py --with-coverage --cover-package=lobby,email_template,building,building_on_tour,garbage_collection,manual,region,tour,building_comment,role,remark_at_building,picture_of_remark,users --with-xunit --xunit-file=/app/coverage.xml
           docker cp backend_test:/app/coverage.xml coverage.xml
           docker-compose down
 

diff --git a/backend/base/signals.py b/backend/base/signals.py
@@ -32,19 +32,17 @@ def progress_current_building_index(sender, instance: RemarkAtBuilding, **kwargs
                 "current_building_index": student_on_tour.current_building_index,
             },
         )
-    elif (instance.type == RemarkAtBuilding.VERTREK and
-          student_on_tour.current_building_index == student_on_tour.max_building_index):
+    elif (
+        instance.type == RemarkAtBuilding.VERTREK
+        and student_on_tour.current_building_index == student_on_tour.max_building_index
+    ):
         student_on_tour.completed_tour = timezone.now()
         student_on_tour.save()
 
         # Broadcast update to websocket
         channel_layer = get_channel_layer()
         async_to_sync(channel_layer.group_send)(
-            "student_on_tour_updates",
-            {
-                "type": 'student.on.tour.completed',
-                "student_on_tour_id": student_on_tour.id
-            }
+            "student_on_tour_updates", {"type": "student.on.tour.completed", "student_on_tour_id": student_on_tour.id}
         )
 
 

diff --git a/backend/requirements.txt b/backend/requirements.txt
@@ -40,7 +40,7 @@ msgpack==1.0.5
 nose==1.3.7
 oauthlib==3.2.2
 phonenumbers==8.13.11
-pip==23.0.1
+pip==23.1.2
 psycopg==3.1.9
 psycopgbinary==0.0.1
 pyOpenSSL==23.1.1

diff --git a/nginx/Dockerfile b/nginx/Dockerfile
@@ -2,4 +2,4 @@ FROM nginx:alpine
 
 ARG ENVIRONMENT
 
-COPY nginx${ENVIRONMENT:+.$ENVIRONMENT}.conf /etc/nginx/nginx.conf
+COPY nginx.${ENVIRONMENT:-development}.conf /etc/nginx/nginx.conf
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@ FROM nginx:alpine

		ARG ENVIRONMENT

		COPY nginx${ENVIRONMENT:+.$ENVIRONMENT}.conf /etc/nginx/nginx.conf
		COPY nginx.${ENVIRONMENT:-development}.conf /etc/nginx/nginx.conf