Merge pull request EGCETSII#32 from Penyagolosa-3/postproc-isamunval

Postproc isamunval
Decide-part-Penyagolosa · Jan 7, 2022 · d3702d8 · d3702d8
2 parents 661a640 + fee9850
commit d3702d8
Show file tree

Hide file tree

Showing 6 changed files with 533 additions and 68 deletions.
diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml
@@ -1,48 +1,48 @@
-name: Python application
-
-on: [push]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        pyversion: ['3.5','3.8']
-    services:
-      postgres:
-        image: postgres:10.8
-        env:
-          POSTGRES_USER: decide
-          POSTGRES_PASSWORD: decide
-          POSTGRES_DB: decide
-        ports:
-          - 5432:5432
-        # needed because the postgres container does not provide a healthcheck
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Set up Python ${{matrix.pyversion}}
-      uses: actions/setup-python@v1
-      with:
-        python-version: ${{matrix.pyversion}}
-    - name: psycopg2 prerequisites
-      run: sudo apt-get install libpq-dev
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -r requirements.txt
-        pip install codacy-coverage
-    - name: Run migrations
-      run: cd decide;python manage.py migrate
-    - name: Run tests postproc   
-      run: cd decide;coverage run --branch --source=. ./manage.py test postproc --keepdb; coverage xml;
-    - name: Run tests visualizer    
-      run: cd decide;coverage run --branch --source=. ./manage.py test visualizer --keepdb; coverage xml;
-    - name: Codacy Coverage Reporter
-      uses: codacy/[email protected]
-      with:
-          project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
-
+name: Python application
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        pyversion: ['3.5','3.8']
+    services:
+      postgres:
+        image: postgres:10.8
+        env:
+          POSTGRES_USER: decide
+          POSTGRES_PASSWORD: decide
+          POSTGRES_DB: decide
+        ports:
+          - 5432:5432
+        # needed because the postgres container does not provide a healthcheck
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Python ${{matrix.pyversion}}
+      uses: actions/setup-python@v1
+      with:
+        python-version: ${{matrix.pyversion}}
+    - name: psycopg2 prerequisites
+      run: sudo apt-get install libpq-dev
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+        pip install codacy-coverage
+    - name: Run migrations
+      run: cd decide;python manage.py migrate
+    - name: Run tests postproc   
+      run: cd decide;coverage run --branch --source=. ./manage.py test postproc --keepdb; coverage xml;
+    - name: Run tests visualizer    
+      run: cd decide;coverage run --branch --source=. ./manage.py test visualizer --keepdb; coverage xml;
+    - name: Codacy Coverage Reporter
+      uses: codacy/[email protected]
+      with:
+          project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
+
           coverage-reports: decide/coverage.xml
diff --git a/decide/authentication/urls.py b/decide/authentication/urls.py
@@ -11,5 +11,4 @@
     path('getuser/', GetUserView.as_view()),
     path('register/', RegisterView.as_view()),
     path('signin/',TemplateView.as_view(template_name="login.html")),
-    path('accounts/',include('allauth.urls')),
 ]
diff --git a/decide/decide/settings.py b/decide/decide/settings.py
@@ -43,13 +43,6 @@
     'gateway',
 
 
-    'allauth',
-    'allauth.account',
-    'allauth.socialaccount',
-    'allauth.socialaccount.providers.microsoft',
-    'allauth.socialaccount.providers.azure',
-    'allauth.socialaccount.providers.google',
-
 ]
 
 REST_FRAMEWORK = {
@@ -199,20 +192,21 @@
         vars()[k] = v
 
 
+
 INSTALLED_APPS = INSTALLED_APPS + MODULES
 
-AUTHENTICATION_BACKENDS = (
-    'django.contrib.auth.backends.ModelBackend',
-    'allauth.account.auth_backends.AuthenticationBackend'
-)
+#AUTHENTICATION_BACKENDS = (
+ #   'django.contrib.auth.backends.ModelBackend',
+  #  'allauth.account.auth_backends.AuthenticationBackend'
+#)
 
-SITE_ID = 2
+#SITE_ID = 2
 
-LOGIN_REDIRECT_URL = '/'
+#LOGIN_REDIRECT_URL = '/'
 
-NOSE_ARGS = [
-    '--with-xunit'
-]
+#NOSE_ARGS = [
+    #'--with-xunit'
+#]
 
-import django_heroku
-django_heroku.settings(locals(),test_runner=False)
+#import django_heroku
+#django_heroku.settings(locals(),test_runner=False)
diff --git a/decide/local_settings.py b/decide/local_settings.py
@@ -13,6 +13,7 @@
     'voting',
 ]
 
+
 BASEURL = 'http://localhost:8000'
 
 APIS = {
@@ -40,5 +41,6 @@
 
 # number of bits for the key, all auths should use the same number of bits
 
+
 KEYBITS = 256