Skip to content
This repository has been archived by the owner on Jan 26, 2021. It is now read-only.

Commit

Permalink
refactor: upgrade django to 3.0.8 and upgrade it's dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
satya7289 authored and SanketDG committed Jul 24, 2020
1 parent 39ddb4d commit 3789c61
Show file tree
Hide file tree
Showing 73 changed files with 634 additions and 1,379 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
sudo: true
language: python
dist: bionic
env:
- MOZ_HEADLESS=1

Expand All @@ -11,6 +12,8 @@ services:

python:
- "3.6"
- "3.7"

before_install:
- wget https://github.com/mozilla/geckodriver/releases/download/v0.20.1/geckodriver-v0.20.1-linux64.tar.gz
- tar -xzvf geckodriver-v0.20.1-linux64.tar.gz
Expand Down Expand Up @@ -44,4 +47,4 @@ notifications:
on_failure: always
on_start: false
after_success:
coveralls --rcfile=.coveragerc
coveralls --rcfile=.coveragerc
28 changes: 14 additions & 14 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
-r prod.txt
Sphinx==1.6.5
coverage==4.4.1
django-nose==1.4.5
flake8==2.4.1
sphinx-rtd-theme==0.2.4
pylint==1.9.0
pytest==3.5.1
pytest-cov==2.5.1
pytest-django==3.2.1
pytest-pylint==0.9.0
selenium==3.12.0
djangorestframework==3.8.2
geopy==1.15.0
pinax-notifications==5.0.3
Sphinx==3.1.2
coverage==5.2
django-nose==1.4.6
flake8==3.8.3
sphinx-rtd-theme==0.5.0
pylint==2.5.3
pytest==5.4.3
pytest-cov==2.10.0
pytest-django==3.9.0
pytest-pylint==0.17.0
selenium==3.141.0
djangorestframework==3.11.0
geopy==2.0.0
pinax-notifications==6.0.0
23 changes: 11 additions & 12 deletions requirements/prod.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
Django==1.11.29
Pillow==4.3.0
django-allauth==0.33.0
django-braces==1.11.0
django-cities-light==3.3.0
django-ckeditor==5.3.1
django-crispy-forms==1.7.0
django-guardian==1.4.9
django-imagekit==4.0.1
Django==3.0.8
Pillow==7.2.0
django-allauth==0.42.0
django-braces==1.14.0
django-cities-light==3.6.0
django-ckeditor==5.9.0
django-crispy-forms==1.9.2
django-guardian==2.3.0
django-imagekit==4.0.2
psycopg2==2.7.3.2
python3-openid==3.1.0
python3-openid==3.2.0
geoip2==3.0.0
django-ipware==3.0.0

django-ipware==3.0.0
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[flake8]
ignore = F403
ignore = F403, F405
exclude = .git,docs/*,systers_portal/manage.py,wsgi.py,migrations
max-line-length = 100
83 changes: 25 additions & 58 deletions systers_portal/blog/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,91 +1,58 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
# Generated by Django 3.0.8 on 2020-07-21 18:28

from django.db import models, migrations
import ckeditor.fields
from django.db import migrations, models


class Migration(migrations.Migration):

initial = True

dependencies = [
('community', '0001_initial'),
('users', '0001_squashed_0003_auto_20160207_1550'),
]

operations = [
migrations.CreateModel(
name='News',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('slug', models.SlugField(unique=True, max_length=150, verbose_name=b'Slug')),
('title', models.CharField(max_length=255, verbose_name=b'Title')),
('date_created', models.DateField(auto_now_add=True, verbose_name=b'Date published')),
('date_modified', models.DateField(auto_now=True, verbose_name=b'Date last modified')),
('content', models.TextField(verbose_name=b'Content')),
('is_public', models.BooleanField(default=True, verbose_name=b'Is public')),
('is_monitored', models.BooleanField(default=False, verbose_name=b'Is monitored')),
('author', models.ForeignKey(verbose_name=b'Author', to='users.SystersUser')),
('community', models.ForeignKey(verbose_name=b'Community', to='community.Community')),
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('slug', models.SlugField(max_length=150, verbose_name='Slug')),
('title', models.CharField(max_length=255, verbose_name='Title')),
('date_created', models.DateField(auto_now_add=True, verbose_name='Date published')),
('date_modified', models.DateField(auto_now=True, verbose_name='Date last modified')),
('content', ckeditor.fields.RichTextField(verbose_name='Content')),
('is_public', models.BooleanField(default=True, verbose_name='Is public')),
('is_monitored', models.BooleanField(default=False, verbose_name='Is monitored')),
],
options={
'verbose_name_plural': 'News',
},
bases=(models.Model,),
),
migrations.CreateModel(
name='Resource',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('slug', models.SlugField(unique=True, max_length=150, verbose_name=b'Slug')),
('title', models.CharField(max_length=255, verbose_name=b'Title')),
('date_created', models.DateField(auto_now_add=True, verbose_name=b'Date published')),
('date_modified', models.DateField(auto_now=True, verbose_name=b'Date last modified')),
('content', models.TextField(verbose_name=b'Content')),
('is_public', models.BooleanField(default=True, verbose_name=b'Is public')),
('is_monitored', models.BooleanField(default=False, verbose_name=b'Is monitored')),
('author', models.ForeignKey(verbose_name=b'Author', to='users.SystersUser')),
('community', models.ForeignKey(verbose_name=b'Community', to='community.Community')),
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('slug', models.SlugField(max_length=150, verbose_name='Slug')),
('title', models.CharField(max_length=255, verbose_name='Title')),
('date_created', models.DateField(auto_now_add=True, verbose_name='Date published')),
('date_modified', models.DateField(auto_now=True, verbose_name='Date last modified')),
('content', ckeditor.fields.RichTextField(verbose_name='Content')),
('is_public', models.BooleanField(default=True, verbose_name='Is public')),
('is_monitored', models.BooleanField(default=False, verbose_name='Is monitored')),
],
options={
'abstract': False,
},
bases=(models.Model,),
),
migrations.CreateModel(
name='ResourceType',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('name', models.CharField(max_length=255)),
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=255, unique=True)),
],
options={
},
bases=(models.Model,),
),
migrations.CreateModel(
name='Tag',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('name', models.CharField(max_length=255)),
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=255, unique=True)),
],
options={
},
bases=(models.Model,),
),
migrations.AddField(
model_name='resource',
name='resource_type',
field=models.ForeignKey(verbose_name=b'Resource type', blank=True, to='blog.ResourceType', null=True),
preserve_default=True,
),
migrations.AddField(
model_name='resource',
name='tags',
field=models.ManyToManyField(to='blog.Tag', null=True, verbose_name=b'Tags', blank=True),
preserve_default=True,
),
migrations.AddField(
model_name='news',
name='tags',
field=models.ManyToManyField(to='blog.Tag', null=True, verbose_name=b'Tags', blank=True),
preserve_default=True,
),
]
25 changes: 0 additions & 25 deletions systers_portal/blog/migrations/0002_auto_20140928_2034.py

This file was deleted.

61 changes: 61 additions & 0 deletions systers_portal/blog/migrations/0002_auto_20200721_1828.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# Generated by Django 3.0.8 on 2020-07-21 18:28

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

initial = True

dependencies = [
('blog', '0001_initial'),
('community', '0001_initial'),
('users', '0001_initial'),
]

operations = [
migrations.AddField(
model_name='resource',
name='author',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='users.SystersUser', verbose_name='Author'),
),
migrations.AddField(
model_name='resource',
name='community',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='community.Community', verbose_name='Community'),
),
migrations.AddField(
model_name='resource',
name='resource_type',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='blog.ResourceType', verbose_name='Resource type'),
),
migrations.AddField(
model_name='resource',
name='tags',
field=models.ManyToManyField(blank=True, to='blog.Tag', verbose_name='Tags'),
),
migrations.AddField(
model_name='news',
name='author',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='users.SystersUser', verbose_name='Author'),
),
migrations.AddField(
model_name='news',
name='community',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='community.Community', verbose_name='Community'),
),
migrations.AddField(
model_name='news',
name='tags',
field=models.ManyToManyField(blank=True, to='blog.Tag', verbose_name='Tags'),
),
migrations.AlterUniqueTogether(
name='resource',
unique_together={('community', 'slug')},
),
migrations.AlterUniqueTogether(
name='news',
unique_together={('community', 'slug')},
),
]
26 changes: 0 additions & 26 deletions systers_portal/blog/migrations/0003_auto_20150303_0501.py

This file was deleted.

Loading

0 comments on commit 3789c61

Please sign in to comment.