diff --git a/.travis.yml b/.travis.yml index ef1eeb44..90ac1ab7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ sudo: false language: python python: - "2.7" - - "3.2" - "3.3" - "3.4" - "3.5" @@ -13,12 +12,8 @@ env: - DJANGO=master matrix: exclude: - - python: "3.2" - env: DJANGO=1.9 - python: "3.3" env: DJANGO=1.9 - - python: "3.2" - env: DJANGO=master - python: "3.3" env: DJANGO=master - python: "3.5" diff --git a/account/language_list.py b/account/language_list.py index ebd9fb69..e356cda5 100644 --- a/account/language_list.py +++ b/account/language_list.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals # List of language code and languages local names. # @@ -13,90 +12,90 @@ # This in turn causes Django 1.7 to think that there is unmigrated changes # ACCOUNT_LANGUAGES_LIST = [ - ("af", "Afrikaans"), - ("ar", "\u0627\u0644\u0639\u0631\u0628\u064a\u0651\u0629"), - ("ast", "asturian"), - ("az", "Az\u0259rbaycanca"), - ("bg", "\u0431\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438"), - ("be", "\u0431\u0435\u043b\u0430\u0440\u0443\u0441\u043a\u0430\u044f"), - ("bn", "\u09ac\u09be\u0982\u09b2\u09be"), - ("br", "brezhoneg"), - ("bs", "bosanski"), - ("ca", "catal\xe0"), - ("cs", "\u010desky"), - ("cy", "Cymraeg"), - ("da", "dansk"), - ("de", "Deutsch"), - ("el", "\u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac"), - ("en", "English"), - ("en-a", "Australian English"), - ("en-gb", "British English"), - ("eo", "Esperanto"), - ("es", "espa\xf1ol"), - ("es-ar", "espa\xf1ol de Argentina"), - ("es-mx", "espa\xf1ol de Mexico"), - ("es-ni", "espa\xf1ol de Nicaragua"), - ("es-ve", "espa\xf1ol de Venezuela"), - ("et", "eesti"), - ("e", "Basque"), - ("fa", "\u0641\u0627\u0631\u0633\u06cc"), - ("fi", "suomi"), - ("fr", "fran\xe7ais"), - ("fy", "frysk"), - ("ga", "Gaeilge"), - ("gl", "galego"), - ("he", "\u05e2\u05d1\u05e8\u05d9\u05ea"), - ("hi", "Hindi"), - ("hr", "Hrvatski"), - ("h", "Magyar"), - ("ia", "Interlingua"), - ("id", "Bahasa Indonesia"), - ("io", "ido"), - ("is", "\xcdslenska"), - ("it", "italiano"), - ("ja", "\u65e5\u672c\u8a9e"), - ("ka", "\u10e5\u10d0\u10e0\u10d7\u10e3\u10da\u10d8"), - ("kk", "\u049a\u0430\u0437\u0430\u049b"), - ("km", "Khmer"), - ("kn", "Kannada"), - ("ko", "\ud55c\uad6d\uc5b4"), - ("lb", "L\xebtzebuergesch"), - ("lt", "Lietuvi\u0161kai"), - ("lv", "latvie\u0161"), - ("mk", "\u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0441\u043a\u0438"), - ("ml", "Malayalam"), - ("mn", "Mongolian"), - ("mr", "\u092e\u0930\u093e\u0920\u0940"), - ("my", "\u1019\u103c\u1014\u103a\u1019\u102c\u1018\u102c\u101e\u102c"), - ("nb", "norsk (bokm\xe5l)"), - ("ne", "\u0928\u0947\u092a\u093e\u0932\u0940"), - ("nl", "Nederlands"), - ("nn", "norsk (nynorsk)"), - ("os", "\u0418\u0440\u043e\u043d"), - ("pa", "Punjabi"), - ("pl", "polski"), - ("pt", "Portugu\xeas"), - ("pt-br", "Portugu\xeas Brasileiro"), - ("ro", "Rom\xe2n\u0103"), - ("r", "\u0420\u0443\u0441\u0441\u043a\u0438\u0439"), - ("sk", "slovensk\xfd"), - ("sl", "Sloven\u0161\u010dina"), - ("sq", "shqip"), - ("sr", "\u0441\u0440\u043f\u0441\u043a\u0438"), - ("sr-latn", "srpski (latinica)"), - ("sv", "svenska"), - ("sw", "Kiswahili"), - ("ta", "\u0ba4\u0bae\u0bbf\u0bb4\u0bcd"), - ("te", "\u0c24\u0c46\u0c32\u0c41\u0c17\u0c41"), - ("th", "\u0e20\u0e32\u0e29\u0e32\u0e44\u0e17\u0e22"), - ("tr", "T\xfcrk\xe7e"), - ("tt", "\u0422\u0430\u0442\u0430\u0440\u0447\u0430"), - ("udm", "\u0423\u0434\u043c\u0443\u0440\u0442"), - ("uk", "\u0423\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430"), - ("ur", "\u0627\u0631\u062f\u0648"), - ("vi", "Ti\xea\u0301ng Vi\xea\u0323t"), - ("zh-cn", "\u7b80\u4f53\u4e2d\u6587"), - ("zh-hans", "\u7b80\u4f53\u4e2d\u6587"), - ("zh-hant", "\u7e41\u9ad4\u4e2d\u6587"), - ("zh-tw", "\u7e41\u9ad4\u4e2d\u6587") + ('af', u'Afrikaans'), + ('ar', u'\u0627\u0644\u0639\u0631\u0628\u064a\u0651\u0629'), + ('ast', u'asturianu'), + ('az', u'Az\u0259rbaycanca'), + ('bg', u'\u0431\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438'), + ('be', u'\u0431\u0435\u043b\u0430\u0440\u0443\u0441\u043a\u0430\u044f'), + ('bn', u'\u09ac\u09be\u0982\u09b2\u09be'), + ('br', u'brezhoneg'), + ('bs', u'bosanski'), + ('ca', u'catal\xe0'), + ('cs', u'\u010desky'), + ('cy', u'Cymraeg'), + ('da', u'dansk'), + ('de', u'Deutsch'), + ('el', u'\u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac'), + ('en', u'English'), + ('en-au', u'Australian English'), + ('en-gb', u'British English'), + ('eo', u'Esperanto'), + ('es', u'espa\xf1ol'), + ('es-ar', u'espa\xf1ol de Argentina'), + ('es-mx', u'espa\xf1ol de Mexico'), + ('es-ni', u'espa\xf1ol de Nicaragua'), + ('es-ve', u'espa\xf1ol de Venezuela'), + ('et', u'eesti'), + ('eu', u'Basque'), + ('fa', u'\u0641\u0627\u0631\u0633\u06cc'), + ('fi', u'suomi'), + ('fr', u'fran\xe7ais'), + ('fy', u'frysk'), + ('ga', u'Gaeilge'), + ('gl', u'galego'), + ('he', u'\u05e2\u05d1\u05e8\u05d9\u05ea'), + ('hi', u'Hindi'), + ('hr', u'Hrvatski'), + ('hu', u'Magyar'), + ('ia', u'Interlingua'), + ('id', u'Bahasa Indonesia'), + ('io', u'ido'), + ('is', u'\xcdslenska'), + ('it', u'italiano'), + ('ja', u'\u65e5\u672c\u8a9e'), + ('ka', u'\u10e5\u10d0\u10e0\u10d7\u10e3\u10da\u10d8'), + ('kk', u'\u049a\u0430\u0437\u0430\u049b'), + ('km', u'Khmer'), + ('kn', u'Kannada'), + ('ko', u'\ud55c\uad6d\uc5b4'), + ('lb', u'L\xebtzebuergesch'), + ('lt', u'Lietuvi\u0161kai'), + ('lv', u'latvie\u0161u'), + ('mk', u'\u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0441\u043a\u0438'), + ('ml', u'Malayalam'), + ('mn', u'Mongolian'), + ('mr', u'\u092e\u0930\u093e\u0920\u0940'), + ('my', u'\u1019\u103c\u1014\u103a\u1019\u102c\u1018\u102c\u101e\u102c'), + ('nb', u'norsk (bokm\xe5l)'), + ('ne', u'\u0928\u0947\u092a\u093e\u0932\u0940'), + ('nl', u'Nederlands'), + ('nn', u'norsk (nynorsk)'), + ('os', u'\u0418\u0440\u043e\u043d'), + ('pa', u'Punjabi'), + ('pl', u'polski'), + ('pt', u'Portugu\xeas'), + ('pt-br', u'Portugu\xeas Brasileiro'), + ('ro', u'Rom\xe2n\u0103'), + ('ru', u'\u0420\u0443\u0441\u0441\u043a\u0438\u0439'), + ('sk', u'slovensk\xfd'), + ('sl', u'Sloven\u0161\u010dina'), + ('sq', u'shqip'), + ('sr', u'\u0441\u0440\u043f\u0441\u043a\u0438'), + ('sr-latn', u'srpski (latinica)'), + ('sv', u'svenska'), + ('sw', u'Kiswahili'), + ('ta', u'\u0ba4\u0bae\u0bbf\u0bb4\u0bcd'), + ('te', u'\u0c24\u0c46\u0c32\u0c41\u0c17\u0c41'), + ('th', u'\u0e20\u0e32\u0e29\u0e32\u0e44\u0e17\u0e22'), + ('tr', u'T\xfcrk\xe7e'), + ('tt', u'\u0422\u0430\u0442\u0430\u0440\u0447\u0430'), + ('udm', u'\u0423\u0434\u043c\u0443\u0440\u0442'), + ('uk', u'\u0423\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430'), + ('ur', u'\u0627\u0631\u062f\u0648'), + ('vi', u'Ti\xea\u0301ng Vi\xea\u0323t'), + ('zh-cn', u'\u7b80\u4f53\u4e2d\u6587'), + ('zh-hans', u'\u7b80\u4f53\u4e2d\u6587'), + ('zh-hant', u'\u7e41\u9ad4\u4e2d\u6587'), + ('zh-tw', u'\u7e41\u9ad4\u4e2d\u6587') ] diff --git a/tox.ini b/tox.ini index 8fdb78e2..2e3000fa 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,6 @@ exclude = account/migrations/* [tox] envlist = py27-1.7, py27-1.8, py27-1.9, py27-master, - py32-1.7, py32-1.8, py33-1.7, py33-1.8, py34-1.7, py34-1.8, py34-1.9, py34-master, py35-1.8, py35-1.9, py35-master @@ -49,20 +48,6 @@ deps = {[testenv]deps} https://github.com/django/django/tarball/master -[testenv:py32-1.7] -basepython = python3.2 -deps = - flake8 == 2.5.0 - coverage == 3.7.1 - Django<1.8 - -[testenv:py32-1.8] -basepython = python3.2 -deps = - flake8 == 2.5.0 - coverage == 3.7.1 - Django<1.9 - [testenv:py33-1.7] basepython = python3.3 deps =