diff --git a/.github/workflows/black_linter.yml b/.github/workflows/black_linter.yml index 58a9870f..e890c8ba 100644 --- a/.github/workflows/black_linter.yml +++ b/.github/workflows/black_linter.yml @@ -23,8 +23,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install black==19.3b pytest - pip install click==8.0.2 + pip install -r app/requirements/testing.txt pip install -r app/requirements/postgres.txt - name: Analysing the code with pylint run: | diff --git a/app/dev_requirements.txt b/app/dev_requirements.txt deleted file mode 100644 index 0fdff81b..00000000 --- a/app/dev_requirements.txt +++ /dev/null @@ -1,5 +0,0 @@ -black==19.3b0 -click==8.0.3 -libsass -django-compressor -django-sass-processor \ No newline at end of file diff --git a/app/projects/tests.py b/app/projects/tests.py index 4f980a14..c7518ef2 100644 --- a/app/projects/tests.py +++ b/app/projects/tests.py @@ -1,17 +1,15 @@ -import pytest import json + +import pytest from django.test import TestCase -from django.urls import reverse -from django.conf import settings as django_settings from django.test.client import RequestFactory -from projects.models import Project, Scenario, Viewer, Asset -from users.models import CustomUser -from django.core.exceptions import ValidationError - +from django.urls import reverse +from projects.models import Project, Scenario, Asset from projects.scenario_topology_helpers import ( load_scenario_from_dict, load_project_from_dict, ) +from users.models import CustomUser class BasicOperationsTest(TestCase): diff --git a/app/requirements/postgres.txt b/app/requirements/base.txt similarity index 72% rename from app/requirements/postgres.txt rename to app/requirements/base.txt index b44ac407..842b33ec 100644 --- a/app/requirements/postgres.txt +++ b/app/requirements/base.txt @@ -2,16 +2,18 @@ django-extensions==3.0.9 Django==3.2.15 django-bootstrap-modal-forms==2.0.0 django-crispy-forms==1.9.2 +django-compressor==4.1 django-jsonview==2.0.0 django-q==1.3.4 +django-sass-processor==1.2.2 gunicorn==20.0.4 +libsass==0.21.0 numpy>=1.22.4 -openpyxl +openpyxl==3.0.10 httpx==0.18.1 -psycopg2-binary==2.9.3 XlsxWriter==1.3.9 requests==2.24.0 exchangelib==4.4.0 jsonschema==4.4.0 plotly==5.6.0 -oemof-thermal==0.0.5 \ No newline at end of file +oemof-thermal==0.0.5 diff --git a/app/requirements/local.txt b/app/requirements/local.txt new file mode 100644 index 00000000..0f5c7b4d --- /dev/null +++ b/app/requirements/local.txt @@ -0,0 +1,7 @@ +-r ./base.txt + +psycopg2-binary==2.9.3 + +black==19.3b +click==8.0.3 +pytest==7.2.0 diff --git a/app/requirements/mysql.txt b/app/requirements/mysql.txt deleted file mode 100644 index 6193d755..00000000 Binary files a/app/requirements/mysql.txt and /dev/null differ diff --git a/app/requirements/production.txt b/app/requirements/production.txt new file mode 100644 index 00000000..fb56a8de --- /dev/null +++ b/app/requirements/production.txt @@ -0,0 +1,3 @@ +-r ./base.txt + +psycopg2-binary==2.9.3 diff --git a/app/requirements/production_mysql.txt b/app/requirements/production_mysql.txt new file mode 100644 index 00000000..8befeca5 Binary files /dev/null and b/app/requirements/production_mysql.txt differ