diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 4d00cd0..5a5d0fc 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -18,11 +18,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - name: Set up Python 3.8 - uses: actions/setup-python@v3 + - uses: actions/checkout@v4 + - name: Set up Python 3.13 + uses: actions/setup-python@v5 with: - python-version: "3.8" + python-version: "3.13" - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/server/docker/release/Dockerfile b/server/docker/release/Dockerfile index ed3ce7f..d3a4e29 100755 --- a/server/docker/release/Dockerfile +++ b/server/docker/release/Dockerfile @@ -1,7 +1,7 @@ # SERVER -FROM python:3.6-alpine -ENV PYTHONUNBUFFERED 1 +FROM python:3.13-alpine +ENV PYTHONUNBUFFERED=1 # [START system dependencies] RUN apk add --update curl gcc g++ \ @@ -16,8 +16,6 @@ RUN apk add --update jpeg-dev zlib-dev libjpeg \ RUN apk add --no-cache ffmpeg -RUN ln -s /usr/include/locale.h /usr/include/xlocale.h - # [START app environment] RUN mkdir /code @@ -30,4 +28,4 @@ COPY . /code/ EXPOSE 8000 -CMD python manage.py runserver 0.0.0.0:8000 \ No newline at end of file +CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"] diff --git a/server/requirements.txt b/server/requirements.txt index 98a752c..e96b3f1 100755 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -1,15 +1,10 @@ -certifi==2018.4.16 -Django==2.2.13 -django-cors-headers==2.4.0 -djangorestframework==3.9.1 -gunicorn==19.7.1 -pipenv==2018.7.1 -pytz==2018.4 -numpy==1.16.0 -colour==0.1.5 -virtualenv==16.0.0 -virtualenv-clone==0.3.0 -zipfile36==0.1.3 -matplotlib==2.2.5 -Pillow==8.3.2 -requests==2.27.1 \ No newline at end of file +Django>=5.1,<5.3 +django-cors-headers>=4.3 +djangorestframework>=3.15 +gunicorn>=22.0 +pytz>=2024.1 +numpy>=1.26 +colour>=0.1.5 +matplotlib>=3.8 +Pillow>=10.0 +requests>=2.32 diff --git a/server/server/settings.py b/server/server/settings.py index d31e082..cef05f3 100755 --- a/server/server/settings.py +++ b/server/server/settings.py @@ -130,3 +130,5 @@ # https://docs.djangoproject.com/en/2.0/howto/static-files/ STATIC_URL = '/static/' + +DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' diff --git a/server/server/urls.py b/server/server/urls.py index 9026414..b7e98f1 100755 --- a/server/server/urls.py +++ b/server/server/urls.py @@ -14,18 +14,16 @@ 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ from django.contrib import admin -from django.conf.urls import url -from django.urls import path,include +from django.urls import path, include, re_path from rest_framework.routers import DefaultRouter from app import views router = DefaultRouter() router.register('app', views.PDDLViewSet) -##router.register('upload',views.FileUploadView.as_view()) urlpatterns = [ path('admin/', admin.site.urls), path('api/', include(router.urls)), - url(r'upload/(?P[^/]+)$',views.LinkUploadView.as_view()), + re_path(r'upload/(?P[^/]+)$', views.LinkUploadView.as_view()), path('help/', views.UserGuide.as_view()), - url(r'downloadVisualisation', views.LinkDownloadPlanimation.as_view()), + re_path(r'downloadVisualisation', views.LinkDownloadPlanimation.as_view()), ]