Skip to content
Permalink
Browse files

Updates to support django 3 with new dependancies

  • Loading branch information
Sean Meyer
Sean Meyer committed Feb 6, 2020
1 parent bdea598 commit c2cc973e11950ecf2b44e106f5abd706b85e74e9
Showing with 32 additions and 11 deletions.
  1. +3 −3 setup.py
  2. +28 −0 src/wiki/migrations/0003_auto_20200206_0327.py
  3. +0 −7 src/wiki/plugins/attachments/forms.py
  4. +1 −1 tests/core/test_accounts.py
@@ -22,13 +22,13 @@ def get_path(fname):


install_requirements = [
"Django>=1.11,<2.3",
"Django>=1.11,<3.1",
"bleach>=2.1,<2.2",
"Pillow",
"django-nyt>=1.1.5,<1.2",
"django-mptt>=0.9,<0.10",
"django-mptt>=0.11,<0.12",
"django-sekizai>=0.10",
"sorl-thumbnail>=12,<13",
"sorl-thumbnail>=12.6.2,<13",
"Markdown>=3.1,<3.2.0",
]

@@ -0,0 +1,28 @@
# Generated by Django 3.0.3 on 2020-02-06 02:27

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('wiki', '0002_urlpath_moved_to'),
]

operations = [
migrations.AlterField(
model_name='urlpath',
name='level',
field=models.PositiveIntegerField(editable=False),
),
migrations.AlterField(
model_name='urlpath',
name='lft',
field=models.PositiveIntegerField(editable=False),
),
migrations.AlterField(
model_name='urlpath',
name='rght',
field=models.PositiveIntegerField(editable=False),
),
]
@@ -87,13 +87,6 @@ class AttachmentArchiveForm(AttachmentForm):
required=False,
)

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
ordered_fields = ["unzip_archive", "file"]
self.fields.keyOrder = ordered_fields + [
k for k in self.fields.keys() if k not in ordered_fields
]

def clean_file(self):
uploaded_file = self.cleaned_data.get("file", None)
if uploaded_file and self.cleaned_data.get("unzip_archive", False):
@@ -38,7 +38,7 @@ def test_password_change(self):

# save a new revision
response = self.client.post(resolve_url("wiki:profile_update"), example_data)
self.assertContains(response, "Passwords don&#39;t match", status_code=200)
self.assertContains(response, "Passwords don", status_code=200) # Django 2/3 output different escaped versions of single quote in don't

# Now check that we don't succeed with unmatching passwords
example_data = {

0 comments on commit c2cc973

Please sign in to comment.
You can’t perform that action at this time.