Merge pull request #14 from WillSams/chore/update-dependencies-2024-02-19

Update Python dependencies

Author: WillSams

.github/workflows/pr-validate.yml

@@ -37,8 +37,8 @@ jobs:
           --max-line-length=96 --statistics --per-file-ignore='specs/**/*:E9,F63,F7,F82'
     - name: Run pytest tests
       run: |
-        chmod +x ./backend/scripts/test.sh
-        cd backend && ./scripts/test.sh
+        chmod +x ./backend/scripts/test-coverage.sh
+        cd backend && ./scripts/test-coverage.sh
 
   unit-test-frontend:
     runs-on: ubuntu-latest

backend/requirements-docker.txt

@@ -1,9 +1,8 @@
-ariadne==0.21
-asyncio==3.4.3
+ariadne==0.22
 asyncpg==0.29.0
 fastapi==0.109.2
 httpx==0.26.0
-pydantic==2.5.3
-python-multipart==0.0.7
+pydantic==2.6.1
+python-multipart==0.0.9
 python-jose==3.3.0
-uvicorn==0.25.0
+uvicorn==0.27.1

backend/run_tests.sh

@@ -0,0 +1,3 @@
+coverage
+node_modules
+specs

backend/scripts/test-converage.sh backend/scripts/test-coverage.sh

@@ -6,13 +6,13 @@
   ],
   "plugins": [ "eslint-comments", "react", "react-refresh" ],
   "root": true,
-  "env": { browser: true, es2020: true },
+  "env": { "browser": true, "es2020": true },
   "parserOptions": {
     "sourceType": "module",
     "ecmaVersion": "latest"
   },
   "ignorePatterns": ["build","specs",".eslintrc"],
-  "settings": { "react": { version: "18.2" } },
+  "settings": { "react": { "version": "18.2" } },
   "rules": {
     "react/jsx-uses-react": "error",
     "react/jsx-uses-vars": "error",
@@ -30,5 +30,5 @@
     "no-case-declarations": "off",
     "no-console": "error",
     "no-debugger": "error"
-  },
+  }
 }

frontend/.dockerignore

@@ -1,16 +1,18 @@
 FROM node:20 as build-stage
 WORKDIR /app
 COPY . .
-RUN npm i -g npm
-RUN npm i --legacy-peer-deps
+RUN npm ci
+# Set default args. Override them at build time if needed
+ARG FRONTEND_PORT="80"
+ARG NODE_ENV="api"  # 'api' is the default production url
+ARG RESERVATION_API="http://localhost:8080/${NODE_ENV}"
+# Set environment variables needed for the build
+ENV FRONTEND_PORT=${FRONTEND_PORT}
+ENV VITE_ENV=${NODE_ENV}
+ENV VITE_RESERVATION_API=${RESERVATION_API}
 RUN npm run build
 
 FROM nginx:alpine
-ARG FRONTEND_PORT="80"
-ARG NODE_ENV="production"
-ENV FRONTEND_PORT=${FRONTEND_PORT}
-ENV NODE_ENV=${NODE_ENV}
-ENV ENV=${NODE_ENV}
 COPY --from=build-stage /app/build/ /usr/share/nginx/html
 EXPOSE ${FRONTEND_PORT}
 CMD ["nginx", "-g", "daemon off;"] 

frontend/.eslintrc

@@ -1,16 +1,15 @@
-ariadne==0.21
+ariadne==0.22
 asyncpg==0.29.0
 black==23.10.1
 fastapi==0.109.2
 flake8==6.1.0
 httpx==0.26.0
 isort==5.13.2
-pydantic==2.5.3
-python-multipart==0.0.7
+pydantic==2.6.1
+python-multipart==0.0.9
 pytest==7.4.3
 pytest-asyncio==0.23.3
 pytest-cov==4.1.0
 pytest-mock==3.12.0
 python-jose==3.3.0
-uvicorn==0.25.0
-
+uvicorn==0.27.1