Updated migration numbering to avoid collisions.

levkowetz · levkowetz · commit a92c2b4ad50a · 2017-05-31T21:36:08.000Z
- Legacy-Id: 13480
diff --git a/ietf/doc/migrations/0030_author_revamp_and_extra_attributes.py b/ietf/doc/migrations/0030_author_revamp_and_extra_attributes.py
@@ -7,8 +7,8 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('name', '0019_formallanguagename'),
-        ('doc', '0025_auto_20170307_0146'),
+        ('name', '0020_formallanguagename'),
+        ('doc', '0029_update_rfc_authors'),
     ]
 
     operations = [
diff --git a/ietf/doc/migrations/0031_remove_fake_email_adresses.py b/ietf/doc/migrations/0031_remove_fake_email_adresses.py
@@ -48,7 +48,7 @@ def fix_invalid_emails(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('doc', '0026_author_revamp_and_extra_attributes'),
+        ('doc', '0030_author_revamp_and_extra_attributes'),
         ('person', '0014_auto_20160613_0751'),
         ('group', '0009_auto_20150930_0758'),
     ]
diff --git a/ietf/doc/tests_downref.py b/ietf/doc/tests_downref.py
@@ -13,6 +13,11 @@
 from ietf.utils.test_utils import login_testing_unauthorized, unicontent
 
 class Downref(TestCase):
+
+    def setUp(self):
+        make_test_data()
+        make_downref_test_data()
+
     def test_downref_registry(self):
         url = urlreverse('ietf.doc.views_downref.downref_registry')
 
@@ -103,7 +108,3 @@ def test_downref_registry_add(self):
         self.assertTrue(RelatedDocument.objects.filter(source=draft, target=rfc, relationship_id='downref-approval'))
         self.assertEqual(draft.docevent_set.count(), draft_de_count_before + 1)
         self.assertEqual(rfc.document.docevent_set.count(), rfc_de_count_before + 1)
-
-    def setUp(self):
-        make_test_data()
-        make_downref_test_data()
diff --git a/ietf/name/migrations/0020_formallanguagename.py b/ietf/name/migrations/0020_formallanguagename.py
@@ -7,7 +7,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('name', '0018_iab_programs'),
+        ('name', '0019_add_docrelationshipname_downref_approval'),
     ]
 
     operations = [
diff --git a/ietf/name/migrations/0021_add_formlang_names.py b/ietf/name/migrations/0021_add_formlang_names.py
@@ -15,7 +15,7 @@ def insert_initial_formal_language_names(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('name', '0019_formallanguagename'),
+        ('name', '0020_formallanguagename'),
     ]
 
     operations = [
diff --git a/ietf/name/migrations/0022_continentname_countryname.py b/ietf/name/migrations/0022_continentname_countryname.py
@@ -7,7 +7,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('name', '0020_add_formlang_names'),
+        ('name', '0021_add_formlang_names'),
     ]
 
     operations = [
diff --git a/ietf/name/migrations/0023_add_country_continent_names.py b/ietf/name/migrations/0023_add_country_continent_names.py
@@ -267,7 +267,7 @@ def insert_initial_country_continent_names(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('name', '0021_continentname_countryname'),
+        ('name', '0022_continentname_countryname'),
     ]
 
     operations = [
diff --git a/ietf/stats/migrations/0001_initial.py b/ietf/stats/migrations/0001_initial.py
@@ -7,7 +7,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('name', '0022_add_country_continent_names'),
+        ('name', '0023_add_country_continent_names'),
     ]
 
     operations = [
diff --git a/ietf/submit/migrations/0019_add_formal_languages_and_words.py b/ietf/submit/migrations/0019_add_formal_languages_and_words.py
@@ -7,7 +7,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('name', '0020_add_formlang_names'),
+        ('name', '0021_add_formlang_names'),
         ('submit', '0018_fix_more_bad_submission_docevents'),
     ]
 
diff --git a/requirements.txt b/requirements.txt
@@ -47,7 +47,7 @@ tqdm>=3.7.0
 Trac>=1.0.10,<1.2
 Unidecode>=0.4.18
 #wsgiref>=0.1.2
-xml2rfc>=2.6.
+xml2rfc>=2.6.0
 xym>=0.1.2,!=0.3
 #zxcvbn-python>=4.4.14		# Not needed until we do back-end password entropy validation
 

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@`
`7`	`7`	`class Migration(migrations.Migration):`
`8`	`8`
`9`	`9`	`dependencies = [`
`10`		`- ('name', '0019_formallanguagename'),`
`11`		`- ('doc', '0025_auto_20170307_0146'),`
	`10`	`+ ('name', '0020_formallanguagename'),`
	`11`	`+ ('doc', '0029_update_rfc_authors'),`
`12`	`12`	`]`
`13`	`13`
`14`	`14`	`operations = [`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ def fix_invalid_emails(apps, schema_editor):`
`48`	`48`	`class Migration(migrations.Migration):`
`49`	`49`
`50`	`50`	`dependencies = [`
`51`		`- ('doc', '0026_author_revamp_and_extra_attributes'),`
	`51`	`+ ('doc', '0030_author_revamp_and_extra_attributes'),`
`52`	`52`	`('person', '0014_auto_20160613_0751'),`
`53`	`53`	`('group', '0009_auto_20150930_0758'),`
`54`	`54`	`]`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`class Migration(migrations.Migration):`
`8`	`8`
`9`	`9`	`dependencies = [`
`10`		`- ('name', '0018_iab_programs'),`
	`10`	`+ ('name', '0019_add_docrelationshipname_downref_approval'),`
`11`	`11`	`]`
`12`	`12`
`13`	`13`	`operations = [`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ def insert_initial_formal_language_names(apps, schema_editor):`
`15`	`15`	`class Migration(migrations.Migration):`
`16`	`16`
`17`	`17`	`dependencies = [`
`18`		`- ('name', '0019_formallanguagename'),`
	`18`	`+ ('name', '0020_formallanguagename'),`
`19`	`19`	`]`
`20`	`20`
`21`	`21`	`operations = [`
Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ def insert_initial_country_continent_names(apps, schema_editor):`
`267`	`267`	`class Migration(migrations.Migration):`
`268`	`268`
`269`	`269`	`dependencies = [`
`270`		`- ('name', '0021_continentname_countryname'),`
	`270`	`+ ('name', '0022_continentname_countryname'),`
`271`	`271`	`]`
`272`	`272`
`273`	`273`	`operations = [`