diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..27becf0 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,46 @@ +name: Django CI + +on: [push, pull_request] + +jobs: + build: + + runs-on: ubuntu-latest + + services: + postgres: + image: postgres:12 + env: + POSTGRES_USER: postgres + POSTGRES_PASSWORD: postgres + POSTGRES_DB: test_db + ports: + - 5432:5432 + options: >- + --health-cmd pg_isready + --health-interval 10s + --health-timeout 5s + --health-retries 5 + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: '3.8' + + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install -r requirements.txt + + - name: Set up PostgreSQL environment variables + run: echo "Environment variables set" + + - name: Apply migrations + run: python manage.py migrate + + - name: Run tests + run: python manage.py test diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml deleted file mode 100644 index 1f8f1a0..0000000 --- a/.github/workflows/django.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: Django CI - -on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - -jobs: - build: - - runs-on: ubuntu-latest - strategy: - max-parallel: 4 - matrix: - python-version: [3.13] - - steps: - - uses: actions/checkout@v4 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 - with: - python-version: ${{ matrix.python-version }} - - name: Install Dependencies - run: | - python -m pip install --upgrade pip - pip install -r requirements.txt - - name: Run Tests - run: | - python manage.py test diff --git a/accounts/views.py b/accounts/views.py index 1c1c3b2..0628edd 100644 --- a/accounts/views.py +++ b/accounts/views.py @@ -13,7 +13,7 @@ from .forms import CustomUserCreationForm, CustomUserChangeForm from django.shortcuts import render from django.shortcuts import render -from django import AuthenticationForm +from django.contrib.auth.forms import AuthenticationForm def home(request): return render(request, 'home.html')