Skip to content

Commit

Permalink
Merge branch 'next'
Browse files Browse the repository at this point in the history
  • Loading branch information
falkecarlsen committed Nov 4, 2020
2 parents 9223212 + 20bb508 commit 9d14464
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 7 deletions.
30 changes: 30 additions & 0 deletions .github/workflows/django.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Django CI

on:
push:
branches: [ next ]
pull_request:
branches: [ next ]

jobs:
build:

runs-on: ubuntu-latest
strategy:
max-parallel: 4
matrix:
python-version: [3.6, 3.7]

steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
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
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ For Ubuntu with virtual envs:
1. Install python3 with pip
- `sudo apt install python3 python3-pip`
2. Create virtual environment
- `python3 -m vevn venv`
- `python3 -m venv venv`
3. Activate virtualenv
- `source venv/bin/activate`
4. Install packages
Expand All @@ -41,11 +41,11 @@ To use it do the following:
3. ???
4. Profit

Admin panel: `http://127.0.0.1:8000/admin/`
Login: tester:treotreo
Admin panel: <http://127.0.0.1:8000/admin/>
Login: `tester:treotreo`

Stregsystem: `http://127.0.0.1:8000/1/`
User: tester
Stregsystem: <http://127.0.0.1:8000/1/>
User: `tester`

Persistent Testdata
-------
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Django==2.2.8
Pillow==6.2.0
Pillow==7.1.0
Coverage==4.4.1
pytz==2018.3
regex==2017.07.28
git+https://github.com/spulec/freezegun.git@39a0f1c103e734e1f88a788e956e7c9fcffb7918
freezegun==0.3.15
Django-Select2==5.11.1
django-debug-toolbar==1.8

0 comments on commit 9d14464

Please sign in to comment.