Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/python-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 3 additions & 5 deletions server/docker/release/Dockerfile
Original file line number Diff line number Diff line change
@@ -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++ \
Expand All @@ -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
Expand All @@ -30,4 +28,4 @@ COPY . /code/

EXPOSE 8000

CMD python manage.py runserver 0.0.0.0:8000
CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"]
25 changes: 10 additions & 15 deletions server/requirements.txt
Original file line number Diff line number Diff line change
@@ -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
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
2 changes: 2 additions & 0 deletions server/server/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,3 +130,5 @@
# https://docs.djangoproject.com/en/2.0/howto/static-files/

STATIC_URL = '/static/'

DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
8 changes: 3 additions & 5 deletions server/server/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -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<filename>[^/]+)$',views.LinkUploadView.as_view()),
re_path(r'upload/(?P<filename>[^/]+)$', 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()),
]
Loading