From 76c4c2231590f9b7f5c0ecb35007e66bd4dccbb3 Mon Sep 17 00:00:00 2001 From: Jonas Andersen Date: Wed, 14 Oct 2020 17:29:58 +0200 Subject: [PATCH 1/5] Update readme --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ee15a7aa..01d9c270 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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: +Login: `tester:treotreo` -Stregsystem: `http://127.0.0.1:8000/1/` -User: tester +Stregsystem: +User: `tester` Persistent Testdata ------- From 713bc1dec56d3ce783bed008691306b760526eb4 Mon Sep 17 00:00:00 2001 From: Falke Carlsen Date: Tue, 3 Nov 2020 21:12:38 +0100 Subject: [PATCH 2/5] Add django test as github action --- .github/workflows/django.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/django.yml diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml new file mode 100644 index 00000000..52e0889d --- /dev/null +++ b/.github/workflows/django.yml @@ -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, 3.8] + + 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 From 1b85999e44e28f878e03ac05fa3a38cba3221d78 Mon Sep 17 00:00:00 2001 From: Falke Carlsen Date: Tue, 3 Nov 2020 21:15:01 +0100 Subject: [PATCH 3/5] Remove py38 from Django CI --- .github/workflows/django.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml index 52e0889d..60c62352 100644 --- a/.github/workflows/django.yml +++ b/.github/workflows/django.yml @@ -13,7 +13,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [3.6, 3.7, 3.8] + python-version: [3.6, 3.7] steps: - uses: actions/checkout@v2 From a2f88dfb560205a14200991f32908578f02c50e1 Mon Sep 17 00:00:00 2001 From: Mathias Jakobsen Date: Wed, 4 Nov 2020 12:44:52 +0000 Subject: [PATCH 4/5] Update freezegun dependency (#199) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 148b7f43..a9cab28b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,6 +3,6 @@ Pillow==6.2.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 From 913eea3da59df9cb36a017e66aa1181c66d75b9d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Nov 2020 12:45:41 +0000 Subject: [PATCH 5/5] Bump pillow from 6.2.0 to 7.1.0 Bumps [pillow](https://github.com/python-pillow/Pillow) from 6.2.0 to 7.1.0. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst) - [Commits](https://github.com/python-pillow/Pillow/compare/6.2.0...7.1.0) Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a9cab28b..48b4aa26 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ Django==2.2.8 -Pillow==6.2.0 +Pillow==7.1.0 Coverage==4.4.1 pytz==2018.3 regex==2017.07.28