From a92c2b4ad50a0d40f9dfeea9c4cd5b6da8b0453e Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Wed, 31 May 2017 21:36:08 +0000 Subject: [PATCH] Updated migration numbering to avoid collisions. - Legacy-Id: 13480 --- ...tes.py => 0030_author_revamp_and_extra_attributes.py} | 4 ++-- ...il_adresses.py => 0031_remove_fake_email_adresses.py} | 2 +- ietf/doc/tests_downref.py | 9 +++++---- ..._formallanguagename.py => 0020_formallanguagename.py} | 2 +- ..._add_formlang_names.py => 0021_add_formlang_names.py} | 2 +- ..._countryname.py => 0022_continentname_countryname.py} | 2 +- ...nent_names.py => 0023_add_country_continent_names.py} | 2 +- ietf/stats/migrations/0001_initial.py | 2 +- .../migrations/0019_add_formal_languages_and_words.py | 2 +- requirements.txt | 2 +- 10 files changed, 15 insertions(+), 14 deletions(-) rename ietf/doc/migrations/{0026_author_revamp_and_extra_attributes.py => 0030_author_revamp_and_extra_attributes.py} (98%) rename ietf/doc/migrations/{0027_remove_fake_email_adresses.py => 0031_remove_fake_email_adresses.py} (97%) rename ietf/name/migrations/{0019_formallanguagename.py => 0020_formallanguagename.py} (91%) rename ietf/name/migrations/{0020_add_formlang_names.py => 0021_add_formlang_names.py} (96%) rename ietf/name/migrations/{0021_continentname_countryname.py => 0022_continentname_countryname.py} (97%) rename ietf/name/migrations/{0022_add_country_continent_names.py => 0023_add_country_continent_names.py} (99%) diff --git a/ietf/doc/migrations/0026_author_revamp_and_extra_attributes.py b/ietf/doc/migrations/0030_author_revamp_and_extra_attributes.py similarity index 98% rename from ietf/doc/migrations/0026_author_revamp_and_extra_attributes.py rename to ietf/doc/migrations/0030_author_revamp_and_extra_attributes.py index e530b37c8..465d2242e 100644 --- a/ietf/doc/migrations/0026_author_revamp_and_extra_attributes.py +++ b/ietf/doc/migrations/0030_author_revamp_and_extra_attributes.py @@ -7,8 +7,8 @@ from django.db import migrations, models 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/0027_remove_fake_email_adresses.py b/ietf/doc/migrations/0031_remove_fake_email_adresses.py similarity index 97% rename from ietf/doc/migrations/0027_remove_fake_email_adresses.py rename to ietf/doc/migrations/0031_remove_fake_email_adresses.py index 7aff8dd41..d6888a517 100644 --- a/ietf/doc/migrations/0027_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 index 5a7ff5931..bce1d7c3a 100644 --- a/ietf/doc/tests_downref.py +++ b/ietf/doc/tests_downref.py @@ -13,6 +13,11 @@ from ietf.utils.test_data import make_test_data, make_downref_test_data 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 @@ class Downref(TestCase): 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/0019_formallanguagename.py b/ietf/name/migrations/0020_formallanguagename.py similarity index 91% rename from ietf/name/migrations/0019_formallanguagename.py rename to ietf/name/migrations/0020_formallanguagename.py index 884e77784..4742516f1 100644 --- a/ietf/name/migrations/0019_formallanguagename.py +++ b/ietf/name/migrations/0020_formallanguagename.py @@ -7,7 +7,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('name', '0018_iab_programs'), + ('name', '0019_add_docrelationshipname_downref_approval'), ] operations = [ diff --git a/ietf/name/migrations/0020_add_formlang_names.py b/ietf/name/migrations/0021_add_formlang_names.py similarity index 96% rename from ietf/name/migrations/0020_add_formlang_names.py rename to ietf/name/migrations/0021_add_formlang_names.py index 2bf378b2e..3375e2118 100644 --- a/ietf/name/migrations/0020_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/0021_continentname_countryname.py b/ietf/name/migrations/0022_continentname_countryname.py similarity index 97% rename from ietf/name/migrations/0021_continentname_countryname.py rename to ietf/name/migrations/0022_continentname_countryname.py index a5a254350..b0a1e91d7 100644 --- a/ietf/name/migrations/0021_continentname_countryname.py +++ b/ietf/name/migrations/0022_continentname_countryname.py @@ -7,7 +7,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('name', '0020_add_formlang_names'), + ('name', '0021_add_formlang_names'), ] operations = [ diff --git a/ietf/name/migrations/0022_add_country_continent_names.py b/ietf/name/migrations/0023_add_country_continent_names.py similarity index 99% rename from ietf/name/migrations/0022_add_country_continent_names.py rename to ietf/name/migrations/0023_add_country_continent_names.py index f05c73dea..2ee423513 100644 --- a/ietf/name/migrations/0022_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 index 121b45b41..19f1b49a9 100644 --- a/ietf/stats/migrations/0001_initial.py +++ b/ietf/stats/migrations/0001_initial.py @@ -7,7 +7,7 @@ from django.db import migrations, models 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 index ec346ca87..fd2ba1164 100644 --- 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 @@ from django.db import migrations, models 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 index 73af8cd1b..9c9af8a82 100644 --- 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