[Issue #347] updated and simplified the requirements.txt, updated the…

… dependencies in the setup.py file, removed obsolete files
KoalixSwitzerland · Mar 30, 2024 · 16dcc33 · 16dcc33
1 parent 0ba4ce7
commit 16dcc33
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 42 deletions.
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -1,14 +1,10 @@
-version: '2.0'
+version: '3.8'
 
 services:
-  db:
-    image: postgres
-  koalixcrm:
-    build: .
-    environment:
-      - DJANGO_SETTINGS_MODULE=projectsettings.settings.docker_development_settings
-      - JAVA_HOME=/usr/bin/jdk1.8.0_181/jre
+  web:
+    image: ghcr.io/koalixswitzerland/koalixcrm-dev-container:main
     ports:
       - "8000:8000"
-    depends_on:
-      - db
+    volumes:
+      - .:/usr/src/app
+      - ./data:/usr/src/app/data
diff --git a/entrypoint.prod.sh b/entrypoint.prod.sh
diff --git a/entrypoint.sh b/entrypoint.sh
diff --git a/requirements.txt b/requirements.txt
@@ -1 +1 @@
--r requirements/heroku_requirements.txt
+-r requirements/prod_requirements.txt
diff --git a/requirements/heroku_requirements.txt b/requirements/heroku_requirements.txt
diff --git a/requirements/base_requirements.txt → requirements/prod_requirements.txt b/requirements/base_requirements.txt → requirements/prod_requirements.txt
diff --git a/requirements/test_requirements.txt b/requirements/test_requirements.txt
diff --git a/setup.py b/setup.py
@@ -10,24 +10,24 @@
       author_email='[email protected]',
       license='BSD',
       packages=find_packages(exclude=["projectsettings", "documentation"]),
-      install_requires=['Django==3.0.7',
-                        'django-filebrowser==3.13.1',
-                        'lxml==4.4.2',
+      install_requires=['Django==3.2.20',
+                        'django-filebrowser==3.14.3',
+                        'lxml==5.1.0',
                         'olefile==0.46',
                         'Pillow==7.1.2',
                         'psycopg2-binary==2.8.4',
-                        'pytz==2019.3',
-                        'django-grappelli==2.14.2',
-                        'djangorestframework==3.11.0',
-                        'djangorestframework-xml==1.4.0',
+                        'pytz==2022.4',
+                        'django-grappelli==2.15.7',
+                        'djangorestframework==3.14.0',
+                        'djangorestframework-xml==2.0.0',
                         'markdown==3.1.1',
-                        'django-filter==2.2.0',
-                        'pandas==0.25.2',
-                        'matplotlib==3.2.1',
+                        'django-filter==23.5',
+                        'pandas==1.5.3',
+                        'matplotlib==3.7.5'
                         ],
       zip_safe=False,
       classifiers=['Development Status :: 4 - Beta',
-                   'Programming Language :: Python :: 3.8', ],
+                   'Programming Language :: Python :: 3.10', ],
       python_requires='~=3.5',
       include_package_data=True,
 )
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		-r requirements/heroku_requirements.txt
		-r requirements/prod_requirements.txt