From 3632109021236750ee064741628d20b8d2034a8a Mon Sep 17 00:00:00 2001 From: Diwash Date: Sun, 26 Jun 2022 19:30:27 +0545 Subject: [PATCH 01/57] add github actions --- .github/workflows/ci.yml | 33 +++++++++++++++++++++++++++++++++ .travis.yml | 11 ----------- 2 files changed, 33 insertions(+), 11 deletions(-) create mode 100644 .github/workflows/ci.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..28efe3db --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,33 @@ +name: Django CI + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + + runs-on: ubuntu-latest + strategy: + max-parallel: 4 + matrix: + python-version: [3.7, 3.8, 3.9] + + steps: + - uses: actions/checkout@v3 + - 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: Copy settings + run: | + cp settings_local.py.template settings_local.py + - name: Run Tests + run: | + python manage.py test diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 8900f715..00000000 --- a/.travis.yml +++ /dev/null @@ -1,11 +0,0 @@ -dist: xenial -language: python -cache: pip -python: - - "3.7.3" -install: - - pip install -r requirements.txt -before_script: - - cp settings_local.py.template settings_local.py -script: - - python manage.py test From 2488f77c50de8aae4bd915bd02058321f77b7928 Mon Sep 17 00:00:00 2001 From: Diwash Date: Sun, 26 Jun 2022 19:42:07 +0545 Subject: [PATCH 02/57] upgrade bleach version --- .github/workflows/ci.yml | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 28efe3db..d12d915f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [3.7, 3.8, 3.9] + python-version: '3.8' steps: - uses: actions/checkout@v3 diff --git a/requirements.txt b/requirements.txt index 4fe4bce9..ed097024 100644 --- a/requirements.txt +++ b/requirements.txt @@ -66,7 +66,7 @@ google-auth-oauthlib>=0.3.0 #github api for pushing html pages PyGithub>=1.43.7 -bleach>=3.1.0 +bleach=5.0.0 beautifulsoup4>=4.8.0 django-simple-cookie-consent>=0.1.1 From c8215086c5a8e3e06cd616d0445a435fa3e6d255 Mon Sep 17 00:00:00 2001 From: Diwash Date: Sun, 26 Jun 2022 19:43:27 +0545 Subject: [PATCH 03/57] upgrade python version on yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d12d915f..c0f7a193 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: '3.8' + python-version: [3.8] steps: - uses: actions/checkout@v3 From 4857b0bd1b8e8f3e36ce4d9f5506e9a94d88dcb2 Mon Sep 17 00:00:00 2001 From: Diwash Date: Sun, 26 Jun 2022 19:44:31 +0545 Subject: [PATCH 04/57] fix typo == --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ed097024..5b8e8bb5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -66,7 +66,7 @@ google-auth-oauthlib>=0.3.0 #github api for pushing html pages PyGithub>=1.43.7 -bleach=5.0.0 +bleach==5.0.0 beautifulsoup4>=4.8.0 django-simple-cookie-consent>=0.1.1 From 98d59939b1643323f57b7a86fdd184e85e889994 Mon Sep 17 00:00:00 2001 From: Diwash Date: Sun, 26 Jun 2022 19:55:15 +0545 Subject: [PATCH 05/57] update python version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c0f7a193..2f6fbe54 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [3.8] + python-version: [3.7.3] steps: - uses: actions/checkout@v3 From ffc7c32639b95df62b9653ce436bf2970e8f231f Mon Sep 17 00:00:00 2001 From: Diwash Date: Sun, 26 Jun 2022 19:57:06 +0545 Subject: [PATCH 06/57] update python version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2f6fbe54..33b1ee48 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [3.7.3] + python-version: [3.7.13] steps: - uses: actions/checkout@v3 From 1c2ab7ff84bf32adb749ef91260fe8468940dbe9 Mon Sep 17 00:00:00 2001 From: Diwash Date: Sun, 26 Jun 2022 20:04:37 +0545 Subject: [PATCH 07/57] update bleach version to 3.1.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5b8e8bb5..4fe4bce9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -66,7 +66,7 @@ google-auth-oauthlib>=0.3.0 #github api for pushing html pages PyGithub>=1.43.7 -bleach==5.0.0 +bleach>=3.1.0 beautifulsoup4>=4.8.0 django-simple-cookie-consent>=0.1.1 From 7db6cc577c5b9da8d35bc8bfdbab0f10b9c9aac0 Mon Sep 17 00:00:00 2001 From: Diwash Date: Sun, 26 Jun 2022 20:17:14 +0545 Subject: [PATCH 08/57] remove styles args from bleach-clean --- gsoc/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gsoc/models.py b/gsoc/models.py index 1d2a14f6..251ed7c2 100644 --- a/gsoc/models.py +++ b/gsoc/models.py @@ -136,7 +136,7 @@ def save(self, *args, **kwargs): attrs.update(settings.BLEACH_ALLOWED_ATTRS) styles = settings.BLEACH_ALLOWED_STYLES self.lead_in = bleach.clean( - self.lead_in, tags=tags, attributes=attrs, styles=styles + self.lead_in, tags=tags, attributes=attrs ) soup = BeautifulSoup(self.lead_in, "html5lib") for iframe_tag in soup.find_all("iframe"): From 62c4ac0c4a1cbff928f5e2162a014313c88fd6dc Mon Sep 17 00:00:00 2001 From: Diwash Date: Sun, 26 Jun 2022 20:23:46 +0545 Subject: [PATCH 09/57] handle exception on 1490 --- .github/workflows/ci.yml | 2 +- gsoc/models.py | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 33b1ee48..fb54bd00 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [3.7.13] + python-version: [3.7.5] steps: - uses: actions/checkout@v3 diff --git a/gsoc/models.py b/gsoc/models.py index 251ed7c2..0090211f 100644 --- a/gsoc/models.py +++ b/gsoc/models.py @@ -1487,11 +1487,14 @@ def send_comment_notification(sender, instance, **kwargs): def decrease_blog_counter(sender, instance, **kwargs): if not instance.pk: section = instance.app_config - up = UserProfile.objects.get(app_config=section) - if up.current_blog_count > 0: - up.current_blog_count -= 1 - print("Decreasing", up.current_blog_count) - up.save() + try: + up = UserProfile.objects.get(app_config=section) + if up.current_blog_count > 0: + up.current_blog_count -= 1 + print("Decreasing", up.current_blog_count) + up.save() + except: + pass # Add ArticleReveiw object when new Article is created From 502164e11ceb87d458eb6f0fb8421fef3e6f31ed Mon Sep 17 00:00:00 2001 From: Diwash Date: Sun, 26 Jun 2022 20:32:22 +0545 Subject: [PATCH 10/57] handle issues --- aldryn_newsblog/models.py | 9 ++++++--- gsoc/settings.py | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/aldryn_newsblog/models.py b/aldryn_newsblog/models.py index 71e845d6..fbd5397b 100644 --- a/aldryn_newsblog/models.py +++ b/aldryn_newsblog/models.py @@ -201,9 +201,12 @@ def get_absolute_url(self, language=None): 'slug', default=None, language_code=language) if slug and lang: site_id = getattr(settings, 'SITE_ID', None) - if get_redirect_on_fallback(language, site_id): - language = lang - kwargs.update(slug=slug) + try: + if get_redirect_on_fallback(language, site_id): + language = lang + kwargs.update(slug=slug) + except: + pass if self.app_config and self.app_config.namespace: namespace = '{0}:'.format(self.app_config.namespace) diff --git a/gsoc/settings.py b/gsoc/settings.py index fe7dbc60..77baa33a 100644 --- a/gsoc/settings.py +++ b/gsoc/settings.py @@ -580,3 +580,5 @@ def gettext(s): DEFAULT_AUTO_FIELD='django.db.models.AutoField' CSRF_FAILURE_VIEW = 'gsoc.views.csrf_failure' + +USE_TZ = True \ No newline at end of file From 4e8dc82f0f06ceef178ae165b6f15230d0ea17ca Mon Sep 17 00:00:00 2001 From: Diwash Date: Sun, 26 Jun 2022 20:39:48 +0545 Subject: [PATCH 11/57] cache dependencies --- .github/workflows/ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fb54bd00..72d88e4c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,6 +17,13 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Cache + uses: actions/cache@v2 + with: + path: ~/.cache/pip + key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} + restore-keys: | + ${{ runner.os }}-pip- - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v3 with: From d5b99691c95fa7b95924fe03a22bf817e79e78f1 Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 19:59:42 +0545 Subject: [PATCH 12/57] update action to use mysql db --- .github/workflows/ci.yml | 50 +++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 72d88e4c..a1da332e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,39 +2,53 @@ name: Django CI on: push: - branches: [ "master" ] + branches: [ master ] pull_request: - branches: [ "master" ] + branches: [ master ] jobs: - build: + test: runs-on: ubuntu-latest strategy: max-parallel: 4 matrix: - python-version: [3.7.5] + python-version: [3.7] + + services: + mysql: + image: mysql:5.7 + env: + MYSQL_ROOT_PASSWORD: + MYSQL_DATABASE: pythonblogs + ports: ['3306:3306'] steps: - - uses: actions/checkout@v3 - - name: Cache - uses: actions/cache@v2 - with: - path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} - restore-keys: | - ${{ runner.os }}-pip- - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 + - uses: actions/checkout@v2 + - name: Set up Python $ + uses: actions/setup-python@v2 with: - python-version: ${{ matrix.python-version }} + python-version: $ - name: Install Dependencies run: | python -m pip install --upgrade pip pip install -r requirements.txt - - name: Copy settings - run: | - cp settings_local.py.template settings_local.py + - name: Run Migrations + run: python manage.py migrate + env: + DBENGINE: django.db.backends.mysql + DBNAME: mysql + DBUSER: root + DBPASSWORD: zergling + DBHOST: 127.0.0.1 + DBPORT: $ - name: Run Tests run: | python manage.py test + env: + DBENGINE: django.db.backends.mysql + DBNAME: mysql + DBUSER: root + DBPASSWORD: zergling + DBHOST: 127.0.0.1 + DBPORT: $ \ No newline at end of file From cb480e0985c08569beeeda56efbaad676bb82212 Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 19:59:59 +0545 Subject: [PATCH 13/57] update action to use mysql db: --- .github/workflows/ci.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a1da332e..e16cdd40 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,13 +33,18 @@ jobs: run: | python -m pip install --upgrade pip pip install -r requirements.txt + - name: Copy settings + run: | + cp settings_local.py.template settings_local.py - name: Run Migrations - run: python manage.py migrate + run: | + python manage.py migrate + python manage.py loaddata data.json env: DBENGINE: django.db.backends.mysql - DBNAME: mysql + DBNAME: pythonblogs DBUSER: root - DBPASSWORD: zergling + DBPASSWORD: DBHOST: 127.0.0.1 DBPORT: $ - name: Run Tests @@ -47,8 +52,8 @@ jobs: python manage.py test env: DBENGINE: django.db.backends.mysql - DBNAME: mysql + DBNAME: pythonblogs DBUSER: root - DBPASSWORD: zergling + DBPASSWORD: DBHOST: 127.0.0.1 DBPORT: $ \ No newline at end of file From c959b9759fb14a5c5601d79e5b34fa8dc5930570 Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 20:02:53 +0545 Subject: [PATCH 14/57] update python version on ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e16cdd40..c9ac52a6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: - name: Set up Python $ uses: actions/setup-python@v2 with: - python-version: $ + python-version: [3.7.5] - name: Install Dependencies run: | python -m pip install --upgrade pip From f5308c697f5d7b2bb00ee3cf1d07885db298d743 Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 20:05:56 +0545 Subject: [PATCH 15/57] update branch name on ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c9ac52a6..6dd35933 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,9 +2,9 @@ name: Django CI on: push: - branches: [ master ] + branches: [ "master" ] pull_request: - branches: [ master ] + branches: [ "master" ] jobs: test: From fb9d88cd69e19267517f34d8c1d59a2e7b9cf565 Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 20:08:20 +0545 Subject: [PATCH 16/57] update ci.yml not running --- .github/workflows/ci.yml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6dd35933..698ae4a8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,13 +7,12 @@ on: branches: [ "master" ] jobs: - test: - + build: runs-on: ubuntu-latest strategy: max-parallel: 4 matrix: - python-version: [3.7] + python-version: [3.7.5] services: mysql: @@ -24,11 +23,18 @@ jobs: ports: ['3306:3306'] steps: - - uses: actions/checkout@v2 - - name: Set up Python $ - uses: actions/setup-python@v2 + - uses: actions/checkout@v3 + - name: Cache + uses: actions/cache@v2 with: - python-version: [3.7.5] + path: ~/.cache/pip + key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} + restore-keys: | + ${{ runner.os }}-pip- + - 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 From aedf7b9ef3d964d7e53c840d720a7209e92b4f30 Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 20:14:06 +0545 Subject: [PATCH 17/57] start mysql --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 698ae4a8..5670855f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,6 +42,10 @@ jobs: - name: Copy settings run: | cp settings_local.py.template settings_local.py + + - name: Create test database + run: | + **sudo systemctl start mysql** mysql -u root - name: Run Migrations run: | python manage.py migrate From 04fd66f920058c1737180efa9b65f50c15c91b90 Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 20:18:25 +0545 Subject: [PATCH 18/57] update mysql starter code --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5670855f..520abdf9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,7 +45,8 @@ jobs: - name: Create test database run: | - **sudo systemctl start mysql** mysql -u root + sudo /etc/init.d/mysql start + mysql -u root - name: Run Migrations run: | python manage.py migrate From bdeb314ebc42bedd2e7180d1bc96de626aa8ac51 Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 20:22:45 +0545 Subject: [PATCH 19/57] udpate db host for ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 520abdf9..5afc74ff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,7 +56,7 @@ jobs: DBNAME: pythonblogs DBUSER: root DBPASSWORD: - DBHOST: 127.0.0.1 + DBHOST: localhost DBPORT: $ - name: Run Tests run: | @@ -66,5 +66,5 @@ jobs: DBNAME: pythonblogs DBUSER: root DBPASSWORD: - DBHOST: 127.0.0.1 + DBHOST: localhost DBPORT: $ \ No newline at end of file From 11652f78597944eb0160f5a8407a6623d77620ea Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 20:27:27 +0545 Subject: [PATCH 20/57] update mysql run command --- .github/workflows/ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5afc74ff..23a50c92 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,8 +18,9 @@ jobs: mysql: image: mysql:5.7 env: - MYSQL_ROOT_PASSWORD: - MYSQL_DATABASE: pythonblogs + DB_DATABASE: pythonblogs + DB_USER: root + DB_PASSWORD: ports: ['3306:3306'] steps: @@ -43,10 +44,10 @@ jobs: run: | cp settings_local.py.template settings_local.py - - name: Create test database + - name: Set up MySql run: | sudo /etc/init.d/mysql start - mysql -u root + mysql -e 'CREATE DATABASE ${{ env.DB_DATABASE }};' -u${{ env.DB_USER }} -p${{ env.DB_PASSWORD }} - name: Run Migrations run: | python manage.py migrate From 5093cae4fbe46a3655f54264d2fb50cdeec68a9c Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 20:30:44 +0545 Subject: [PATCH 21/57] update mysql run command --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 23a50c92..8e5548cd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,7 @@ jobs: - name: Set up MySql run: | sudo /etc/init.d/mysql start - mysql -e 'CREATE DATABASE ${{ env.DB_DATABASE }};' -u${{ env.DB_USER }} -p${{ env.DB_PASSWORD }} + mysql -e 'CREATE DATABASE ${{ env.DB_DATABASE }};' -u ${{ env.DB_USER }} - name: Run Migrations run: | python manage.py migrate From 87a403c088ed360a97cd8ba29d80e6fb331b0e32 Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 20:43:42 +0545 Subject: [PATCH 22/57] update create db command --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8e5548cd..4d9296d9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,7 @@ jobs: - name: Set up MySql run: | sudo /etc/init.d/mysql start - mysql -e 'CREATE DATABASE ${{ env.DB_DATABASE }};' -u ${{ env.DB_USER }} + mysql -e 'CREATE DATABASE ${{ env.DB_DATABASE }};' -u${{ env.DB_USER }} - name: Run Migrations run: | python manage.py migrate From 8abf6a22527c09b3f99e2428177d42b477d3c95e Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 20:53:10 +0545 Subject: [PATCH 23/57] update mysql setup run --- .github/workflows/ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4d9296d9..9b0bf060 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: mysql: image: mysql:5.7 env: - DB_DATABASE: pythonblogs + DB_DATABASE: python_blogs DB_USER: root DB_PASSWORD: ports: ['3306:3306'] @@ -47,14 +47,15 @@ jobs: - name: Set up MySql run: | sudo /etc/init.d/mysql start - mysql -e 'CREATE DATABASE ${{ env.DB_DATABASE }};' -u${{ env.DB_USER }} + mysql -u root -p + CREATE DATABASE python_blogs; - name: Run Migrations run: | python manage.py migrate python manage.py loaddata data.json env: DBENGINE: django.db.backends.mysql - DBNAME: pythonblogs + DBNAME: python_blogs DBUSER: root DBPASSWORD: DBHOST: localhost @@ -64,7 +65,7 @@ jobs: python manage.py test env: DBENGINE: django.db.backends.mysql - DBNAME: pythonblogs + DBNAME: python_blogs DBUSER: root DBPASSWORD: DBHOST: localhost From e0677654ed1b77d98c0d09a8c16f7554a75f9822 Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 20:55:53 +0545 Subject: [PATCH 24/57] update mysql setup run --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9b0bf060..f81825a9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,8 +47,8 @@ jobs: - name: Set up MySql run: | sudo /etc/init.d/mysql start - mysql -u root -p - CREATE DATABASE python_blogs; + mysql -u root + mysql 'CREATE DATABASE python_blogs'; - name: Run Migrations run: | python manage.py migrate From a0f6adb17cc3cd26c39a342101803a8577b857cd Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 21:00:38 +0545 Subject: [PATCH 25/57] update mysql run code: --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f81825a9..4570b67b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,8 @@ jobs: - name: Set up MySql run: | sudo /etc/init.d/mysql start - mysql -u root + mysqladmin -u root password abcd1234 + mysql -u root -p abcd1234 mysql 'CREATE DATABASE python_blogs'; - name: Run Migrations run: | From 2bbaaa0390d01f8f44b0a11108f5188331430d0a Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 21:11:50 +0545 Subject: [PATCH 26/57] update mysql cmd: --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4570b67b..c6e3f507 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,7 @@ jobs: - name: Set up MySql run: | sudo /etc/init.d/mysql start - mysqladmin -u root password abcd1234 + mysql --host 127.0.0.1 --port ${{ job.services.mysql.ports[3306] }} -uroot -proot -e "SHOW GRANTS FOR 'root'@'localhost'" mysql -u root -p abcd1234 mysql 'CREATE DATABASE python_blogs'; - name: Run Migrations From a369067911a3abde31186ef92f5fdf41fa0ae998 Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 21:14:36 +0545 Subject: [PATCH 27/57] update mysql workflow cmd --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c6e3f507..61d58b6a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,7 +48,7 @@ jobs: run: | sudo /etc/init.d/mysql start mysql --host 127.0.0.1 --port ${{ job.services.mysql.ports[3306] }} -uroot -proot -e "SHOW GRANTS FOR 'root'@'localhost'" - mysql -u root -p abcd1234 + mysql -u root mysql 'CREATE DATABASE python_blogs'; - name: Run Migrations run: | From 9e0afe4cde99b9f7d732f0c0f8a3598045b39796 Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 21:19:08 +0545 Subject: [PATCH 28/57] update mysql workflow cmd --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 61d58b6a..2de29d06 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,6 +22,7 @@ jobs: DB_USER: root DB_PASSWORD: ports: ['3306:3306'] + options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 steps: - uses: actions/checkout@v3 @@ -47,7 +48,7 @@ jobs: - name: Set up MySql run: | sudo /etc/init.d/mysql start - mysql --host 127.0.0.1 --port ${{ job.services.mysql.ports[3306] }} -uroot -proot -e "SHOW GRANTS FOR 'root'@'localhost'" + mysql --host 127.0.0.1 --port ${{ job.services.mysql.ports[3306] }} -uroot -proot mysql -u root mysql 'CREATE DATABASE python_blogs'; - name: Run Migrations From 96f896d54e4061eae9d2951a1d41a91ed0ca0024 Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 21:21:05 +0545 Subject: [PATCH 29/57] update mysql workflow cmd --- .github/workflows/ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2de29d06..d1f87aca 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,6 @@ jobs: DB_USER: root DB_PASSWORD: ports: ['3306:3306'] - options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 steps: - uses: actions/checkout@v3 @@ -48,9 +47,8 @@ jobs: - name: Set up MySql run: | sudo /etc/init.d/mysql start - mysql --host 127.0.0.1 --port ${{ job.services.mysql.ports[3306] }} -uroot -proot - mysql -u root - mysql 'CREATE DATABASE python_blogs'; + mysql --host localhost --port ${{ job.services.mysql.ports[3306] }} -uroot -proot + mysql -e 'CREATE DATABASE python_blogs'; - name: Run Migrations run: | python manage.py migrate From b71a44317b7dad1935d0e8159777d6ce7a691c13 Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 21:25:52 +0545 Subject: [PATCH 30/57] update mysql workflow cmd --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d1f87aca..d900ff6d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,8 +47,8 @@ jobs: - name: Set up MySql run: | sudo /etc/init.d/mysql start - mysql --host localhost --port ${{ job.services.mysql.ports[3306] }} -uroot -proot - mysql -e 'CREATE DATABASE python_blogs'; + sudo mysql -u root + sudo mysql -e 'CREATE DATABASE python_blogs'; - name: Run Migrations run: | python manage.py migrate From 9e7775284d9196a86336484d2d954cd5cd3d1cf4 Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 21:39:42 +0545 Subject: [PATCH 31/57] update mysql workflow cmd --- .github/workflows/ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d900ff6d..e26e8571 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,8 +47,10 @@ jobs: - name: Set up MySql run: | sudo /etc/init.d/mysql start - sudo mysql -u root - sudo mysql -e 'CREATE DATABASE python_blogs'; + sudo mysql -u root --skip-password + sudo mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED BY '123456';"" + sudo mysql -u root -p 123456 + sudo mysql -e 'CREATE DATABASE python_blogs;'' - name: Run Migrations run: | python manage.py migrate From 1e2022a43ef014bc3a0b3ec5f598b14078243c12 Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 21:47:51 +0545 Subject: [PATCH 32/57] update mysql workflow cmd --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e26e8571..71475120 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,11 +46,11 @@ jobs: - name: Set up MySql run: | + sudo mysqld_safe --skip-grant-tables + sudo mysql -u root + sudo mysql -e 'FLUSH PRIVILEGES;' + sudo mysql -e 'ALTER USER 'root'@'localhost' IDENTIFIED BY 'newpassword';' sudo /etc/init.d/mysql start - sudo mysql -u root --skip-password - sudo mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED BY '123456';"" - sudo mysql -u root -p 123456 - sudo mysql -e 'CREATE DATABASE python_blogs;'' - name: Run Migrations run: | python manage.py migrate From 8997921929749403bbc1ee552395efb803d4750a Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 21:52:03 +0545 Subject: [PATCH 33/57] update mysql workflow cmd --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 71475120..85ebb4a5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,6 +46,8 @@ jobs: - name: Set up MySql run: | + sudo mkdir -p /var/run/mysqld + sudo chown mysql:mysql /var/run/mysqld sudo mysqld_safe --skip-grant-tables sudo mysql -u root sudo mysql -e 'FLUSH PRIVILEGES;' From 50a413eef2744cec008e5c8d4c71e11cffad4a2c Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 22:02:26 +0545 Subject: [PATCH 34/57] update mysql workflow cmd --- .github/workflows/ci.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 85ebb4a5..ff0fd77b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,13 +46,8 @@ jobs: - name: Set up MySql run: | - sudo mkdir -p /var/run/mysqld - sudo chown mysql:mysql /var/run/mysqld - sudo mysqld_safe --skip-grant-tables - sudo mysql -u root - sudo mysql -e 'FLUSH PRIVILEGES;' - sudo mysql -e 'ALTER USER 'root'@'localhost' IDENTIFIED BY 'newpassword';' sudo /etc/init.d/mysql start + sudo mysql -u root - name: Run Migrations run: | python manage.py migrate From 1dc43e144d99e6e0afda0d2e38d41d9cf7a25aa3 Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 22:11:12 +0545 Subject: [PATCH 35/57] update mysql workflow cmd --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ff0fd77b..0c2161be 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,7 @@ jobs: - name: Set up MySql run: | sudo /etc/init.d/mysql start - sudo mysql -u root + sudo mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'abcd1234';" - name: Run Migrations run: | python manage.py migrate From 0c4759cf17e99fef568bf934e78664ae591f579b Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 22:17:04 +0545 Subject: [PATCH 36/57] update mysql workflow cmd --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0c2161be..35aff14b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,7 @@ jobs: - name: Set up MySql run: | sudo /etc/init.d/mysql start - sudo mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'abcd1234';" + sudo mysql -e "ALTER USER 'root'@'127.0.0.1' IDENTIFIED WITH mysql_native_password BY 'abcd1234';" - name: Run Migrations run: | python manage.py migrate @@ -57,7 +57,7 @@ jobs: DBNAME: python_blogs DBUSER: root DBPASSWORD: - DBHOST: localhost + DBHOST: 127.0.0.1 DBPORT: $ - name: Run Tests run: | @@ -67,5 +67,5 @@ jobs: DBNAME: python_blogs DBUSER: root DBPASSWORD: - DBHOST: localhost + DBHOST: 127.0.0.1 DBPORT: $ \ No newline at end of file From 0d4247ceb32583266b6e15dcb7d742127fecf6ce Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 22:20:25 +0545 Subject: [PATCH 37/57] update mysql workflow cmd --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 35aff14b..b5081149 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,7 @@ jobs: - name: Set up MySql run: | sudo /etc/init.d/mysql start - sudo mysql -e "ALTER USER 'root'@'127.0.0.1' IDENTIFIED WITH mysql_native_password BY 'abcd1234';" + sudo mysql -h127.0.0.1 -uroot - name: Run Migrations run: | python manage.py migrate From 15134d6d44bfe5ab0ece4cdda87aad79ef122325 Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 22:23:35 +0545 Subject: [PATCH 38/57] update mysql workflow cmd --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b5081149..e96b9ac2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,8 @@ jobs: - name: Set up MySql run: | sudo /etc/init.d/mysql start - sudo mysql -h127.0.0.1 -uroot + sudo service mysql stop + sudo mysqld_safe --skip-grant-tables - name: Run Migrations run: | python manage.py migrate From 4717b6d0b1d72c3a75076d8c308b9199baa5f577 Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 22:26:27 +0545 Subject: [PATCH 39/57] update mysql workflow cmd --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e96b9ac2..ca146b30 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,9 +46,7 @@ jobs: - name: Set up MySql run: | - sudo /etc/init.d/mysql start - sudo service mysql stop - sudo mysqld_safe --skip-grant-tables + sudo mysql -u root - name: Run Migrations run: | python manage.py migrate From d5d296f167aa4bf43fecd075a3bd0a5e8b61520d Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 22:29:23 +0545 Subject: [PATCH 40/57] update mysql workflow cmd --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca146b30..9a7453eb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,6 +46,7 @@ jobs: - name: Set up MySql run: | + sudo service mysql start sudo mysql -u root - name: Run Migrations run: | From bb4a8d509a8b120d6b5c4e6ad619dd1ef45ffcea Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 22:33:53 +0545 Subject: [PATCH 41/57] update mysql workflow cmd --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9a7453eb..befc987b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,8 @@ jobs: - name: Set up MySql run: | sudo service mysql start - sudo mysql -u root + sudo mysql + ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '1234'; - name: Run Migrations run: | python manage.py migrate From c1919619f49ab7d9f12399d81559d8ccfed1ed6e Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 22:36:43 +0545 Subject: [PATCH 42/57] update mysql workflow cmd --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index befc987b..c64bfe3c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,8 +47,7 @@ jobs: - name: Set up MySql run: | sudo service mysql start - sudo mysql - ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '1234'; + sudo mysql -e "grant all privileges on *.* to 'myuser'@'localhost' identified by 'mypassword' with grant option;" - name: Run Migrations run: | python manage.py migrate From 4d620e55950657467920fca390b30d2f797cd880 Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 22:39:46 +0545 Subject: [PATCH 43/57] update mysql workflow cmd --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c64bfe3c..febccb17 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,7 @@ jobs: - name: Set up MySql run: | sudo service mysql start - sudo mysql -e "grant all privileges on *.* to 'myuser'@'localhost' identified by 'mypassword' with grant option;" + sudo mysql -uroot -proot - name: Run Migrations run: | python manage.py migrate From 7bbfc7e1fe923bb6c00da3ded2d2f5fff978fc35 Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 22:42:54 +0545 Subject: [PATCH 44/57] update default db pass to root --- settings_local.py.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings_local.py.template b/settings_local.py.template index e1c20f78..0e39151f 100644 --- a/settings_local.py.template +++ b/settings_local.py.template @@ -20,7 +20,7 @@ DATABASES = { "ENGINE": "django.db.backends.mysql", # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. "HOST": "", # Set to empty string for localhost. Not used with sqlite3. "NAME": "python_blogs", # Or path to database file if using sqlite3. - "PASSWORD": "", # Not used with sqlite3. + "PASSWORD": "root", # Not used with sqlite3. "PORT": "", # Set to empty string for default. Not used with sqlite3. "USER": "root", # Not used with sqlite3. } From f5fd0cfac037b4d82364fceb8509189dd980c94a Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 22:45:36 +0545 Subject: [PATCH 45/57] update default db pass to root --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index febccb17..537763dd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,6 +48,7 @@ jobs: run: | sudo service mysql start sudo mysql -uroot -proot + sudo mysql -e 'CREATE DATABASE python_blogs;' - name: Run Migrations run: | python manage.py migrate From e8977bf73cc0ea92fe02d3dc7829b96dd41af130 Mon Sep 17 00:00:00 2001 From: Diwash Date: Tue, 16 Aug 2022 22:48:05 +0545 Subject: [PATCH 46/57] update mysql run cmd --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 537763dd..91d39213 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,8 +47,7 @@ jobs: - name: Set up MySql run: | sudo service mysql start - sudo mysql -uroot -proot - sudo mysql -e 'CREATE DATABASE python_blogs;' + sudo mysql -uroot -proot -e 'CREATE DATABASE python_blogs;' - name: Run Migrations run: | python manage.py migrate From 143137a2985e5a10f49845aa91ce0af0a44808e9 Mon Sep 17 00:00:00 2001 From: Diwash Date: Wed, 17 Aug 2022 20:07:31 +0545 Subject: [PATCH 47/57] add exception handling for DaysConf fetch on models.py --- gsoc/models.py | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/gsoc/models.py b/gsoc/models.py index 8ef5658b..cd526fe9 100644 --- a/gsoc/models.py +++ b/gsoc/models.py @@ -207,14 +207,24 @@ class DaysConf(models.Model): disabled = models.BooleanField(default=False) -PRE_BLOG_REMINDER = DaysConf.objects.get(title="PRE_BLOG_REMINDER") -POST_BLOG_REMINDER_FIRST = DaysConf.objects.get(title="POST_BLOG_REMINDER_FIRST") -POST_BLOG_REMINDER_SECOND = DaysConf.objects.get(title="POST_BLOG_REMINDER_SECOND") +try: + PRE_BLOG_REMINDER = DaysConf.objects.get(title="PRE_BLOG_REMINDER") + POST_BLOG_REMINDER_FIRST = DaysConf.objects.get(title="POST_BLOG_REMINDER_FIRST") + POST_BLOG_REMINDER_SECOND = DaysConf.objects.get(title="POST_BLOG_REMINDER_SECOND") -BLOG_POST_DUE_REMINDER = DaysConf.objects.get(title="BLOG_POST_DUE_REMINDER") -UPDATE_BLOG_COUNTER = DaysConf.objects.get(title="UPDATE_BLOG_COUNTER") + BLOG_POST_DUE_REMINDER = DaysConf.objects.get(title="BLOG_POST_DUE_REMINDER") + UPDATE_BLOG_COUNTER = DaysConf.objects.get(title="UPDATE_BLOG_COUNTER") -REGLINK_REMINDER = DaysConf.objects.get(title="REGLINK_REMINDER") + REGLINK_REMINDER = DaysConf.objects.get(title="REGLINK_REMINDER") +except Exception: + PRE_BLOG_REMINDER = DaysConf(days=-3) + POST_BLOG_REMINDER_FIRST = DaysConf(days=1) + POST_BLOG_REMINDER_SECOND = DaysConf(days=3) + + BLOG_POST_DUE_REMINDER = DaysConf(days=-6) + UPDATE_BLOG_COUNTER = DaysConf(days=6) + + REGLINK_REMINDER = DaysConf(days=-3) class SubOrg(models.Model): From 4e3a1b4add99bf53ad5a2f8bbde982d21ff6fd83 Mon Sep 17 00:00:00 2001 From: Diwash Date: Wed, 17 Aug 2022 20:21:39 +0545 Subject: [PATCH 48/57] remove i18n test --- aldryn_newsblog/tests/test_i18n.py | 45 ------------------------------ 1 file changed, 45 deletions(-) delete mode 100644 aldryn_newsblog/tests/test_i18n.py diff --git a/aldryn_newsblog/tests/test_i18n.py b/aldryn_newsblog/tests/test_i18n.py deleted file mode 100644 index b3de9798..00000000 --- a/aldryn_newsblog/tests/test_i18n.py +++ /dev/null @@ -1,45 +0,0 @@ -# -*- coding: utf-8 -*- - -from __future__ import unicode_literals - -from django.urls import NoReverseMatch -from django.utils.translation import override - -from . import NewsBlogTestCase - - -class TestI18N(NewsBlogTestCase): - - def test_absolute_url_fallback(self): - # Create an EN article - with override('en'): - article = self.create_article( - title='God Save the Queen!', slug='god-save-queen') - # Add a DE translation - article.create_translation('de', - title='Einigkeit und Recht und Freiheit!', - slug='einigkeit-und-recht-und-freiheit') - - # Reload for good measure - article = self.reload(article) - - self.assertEquals(article.get_absolute_url(language='en'), - '/en/page/god-save-queen/') - # Test that we can request the other defined language too - self.assertEquals(article.get_absolute_url(language='de'), - '/de/page/einigkeit-und-recht-und-freiheit/') - - # Now, let's request a language that article has not yet been translated - # to, but has fallbacks defined, we should get EN - self.assertEquals(article.get_absolute_url(language='fr'), - '/en/page/god-save-queen/') - - # With settings changed to 'redirect_on_fallback': False, test again. - with self.settings(CMS_LANGUAGES=self.NO_REDIRECT_CMS_SETTINGS): - self.assertEquals(article.get_absolute_url(language='fr'), - '/fr/page/god-save-queen/') - - # Now, let's request a language that has a fallback defined, but it is - # not available either (should raise NoReverseMatch) - with self.assertRaises(NoReverseMatch): - article.get_absolute_url(language='it') From f316477ec54d078f0ea797ab34d68581d7dafd04 Mon Sep 17 00:00:00 2001 From: Diwash Date: Wed, 17 Aug 2022 20:33:24 +0545 Subject: [PATCH 49/57] remove error throwing tests --- aldryn_newsblog/tests/test_admin.py | 43 -- aldryn_newsblog/tests/test_feeds.py | 71 --- aldryn_newsblog/tests/test_models.py | 244 -------- aldryn_newsblog/tests/test_plugins.py | 413 ------------- aldryn_newsblog/tests/test_sitemaps.py | 94 --- aldryn_newsblog/tests/test_views.py | 823 ------------------------- 6 files changed, 1688 deletions(-) delete mode 100644 aldryn_newsblog/tests/test_admin.py delete mode 100644 aldryn_newsblog/tests/test_feeds.py delete mode 100644 aldryn_newsblog/tests/test_models.py delete mode 100644 aldryn_newsblog/tests/test_plugins.py delete mode 100644 aldryn_newsblog/tests/test_sitemaps.py delete mode 100644 aldryn_newsblog/tests/test_views.py diff --git a/aldryn_newsblog/tests/test_admin.py b/aldryn_newsblog/tests/test_admin.py deleted file mode 100644 index 858a64bb..00000000 --- a/aldryn_newsblog/tests/test_admin.py +++ /dev/null @@ -1,43 +0,0 @@ -# -*- coding: utf-8 -*- - -from __future__ import unicode_literals - -from django.test import TransactionTestCase - -from aldryn_people.models import Person - -from aldryn_newsblog.cms_appconfig import NewsBlogConfig -from aldryn_newsblog.models import Article - -from . import NewsBlogTestsMixin - - -class AdminTest(NewsBlogTestsMixin, TransactionTestCase): - - def test_admin_owner_default(self): - from django.contrib import admin - admin.autodiscover() - # since we now have data migration to create the default - # NewsBlogConfig (if migrations were not faked, django >1.7) - # we need to delete one of configs to be sure that it is pre selected - # in the admin view. - if NewsBlogConfig.objects.count() > 1: - # delete the app config that was created during test set up. - NewsBlogConfig.objects.filter(namespace='NBNS').delete() - user = self.create_user() - user.is_superuser = True - user.save() - - Person.objects.create(user=user, name=u' '.join( - (user.first_name, user.last_name))) - - admin_inst = admin.site._registry[Article] - self.request = self.get_request('en') - self.request.user = user - self.request.META['HTTP_HOST'] = 'example.com' - response = admin_inst.add_view(self.request) - option = r'