From b9e188f3027820f114db99e687d8ca9243f08c38 Mon Sep 17 00:00:00 2001 From: Jeff Quast Date: Fri, 1 Jul 2016 21:20:35 -0700 Subject: [PATCH 1/7] Update for Unicode 9.0.0 --- README.rst | 14 +++++--- wcwidth/table_wide.py | 79 ++++++++++++++++++++++++++++++++++++++++--- wcwidth/table_zero.py | 29 +++++++++++++--- 3 files changed, 109 insertions(+), 13 deletions(-) diff --git a/README.rst b/README.rst index a96da84..1ca84ae 100644 --- a/README.rst +++ b/README.rst @@ -42,11 +42,14 @@ unicode string is expected to occupy.* This library aims to be forward-looking, portable, and most correct. The most current release of this API is based on the Unicode Standard release files: -``EastAsianWidth-8.0.0.txt`` - *2015-02-10, 21:00:00 GMT [KW, LI]* +``DerivedGeneralCategory-9.0.0.txt`` + *Date: 2016-06-01, 10:34:26 GMT* + © 2016 Unicode®, Inc. + +``EastAsianWidth-9.0.0.txt`` + *Date: 2016-05-27, 17:00:00 GMT [KW, LI]* + © 2016 Unicode®, Inc. -``DerivedGeneralCategory-8.0.0.txt`` - *2015-02-13, 13:47:11 GMT [MD]* Installation ------------ @@ -160,6 +163,9 @@ source code. They are not distributed. History ======= +0.1.7 *2016-07-01* + * **Updated** tables to Unicode Specification 9.0.0. + 0.1.6 *2016-01-08 Production/Stable* * ``LICENSE`` file now included with distribution. diff --git a/wcwidth/table_wide.py b/wcwidth/table_wide.py index c2f1b36..0356c88 100644 --- a/wcwidth/table_wide.py +++ b/wcwidth/table_wide.py @@ -1,10 +1,43 @@ """Wide_Eastasian table. Created by setup.py.""" -# Generated: 2015-09-14T01:48:19.503860 -# Source: EastAsianWidth-8.0.0.txt -# Date: 2015-02-10, 21:00:00 GMT [KW, LI] +# Generated: 2016-07-02T04:20:28.048222 +# Source: EastAsianWidth-9.0.0.txt +# Date: 2016-05-27, 17:00:00 GMT [KW, LI] WIDE_EASTASIAN = ( (0x1100, 0x115f,), # Hangul Choseong Kiyeok ..Hangul Choseong Filler + (0x231a, 0x231b,), # Watch ..Hourglass (0x2329, 0x232a,), # Left-pointing Angle Brac..Right-pointing Angle Bra + (0x23e9, 0x23ec,), # Black Right-pointing Dou..Black Down-pointing Doub + (0x23f0, 0x23f0,), # Alarm Clock ..Alarm Clock + (0x23f3, 0x23f3,), # Hourglass With Flowing S..Hourglass With Flowing S + (0x25fd, 0x25fe,), # White Medium Small Squar..Black Medium Small Squar + (0x2614, 0x2615,), # Umbrella With Rain Drops..Hot Beverage + (0x2648, 0x2653,), # Aries ..Pisces + (0x267f, 0x267f,), # Wheelchair Symbol ..Wheelchair Symbol + (0x2693, 0x2693,), # Anchor ..Anchor + (0x26a1, 0x26a1,), # High Voltage Sign ..High Voltage Sign + (0x26aa, 0x26ab,), # Medium White Circle ..Medium Black Circle + (0x26bd, 0x26be,), # Soccer Ball ..Baseball + (0x26c4, 0x26c5,), # Snowman Without Snow ..Sun Behind Cloud + (0x26ce, 0x26ce,), # Ophiuchus ..Ophiuchus + (0x26d4, 0x26d4,), # No Entry ..No Entry + (0x26ea, 0x26ea,), # Church ..Church + (0x26f2, 0x26f3,), # Fountain ..Flag In Hole + (0x26f5, 0x26f5,), # Sailboat ..Sailboat + (0x26fa, 0x26fa,), # Tent ..Tent + (0x26fd, 0x26fd,), # Fuel Pump ..Fuel Pump + (0x2705, 0x2705,), # White Heavy Check Mark ..White Heavy Check Mark + (0x270a, 0x270b,), # Raised Fist ..Raised Hand + (0x2728, 0x2728,), # Sparkles ..Sparkles + (0x274c, 0x274c,), # Cross Mark ..Cross Mark + (0x274e, 0x274e,), # Negative Squared Cross M..Negative Squared Cross M + (0x2753, 0x2755,), # Black Question Mark Orna..White Exclamation Mark O + (0x2757, 0x2757,), # Heavy Exclamation Mark S..Heavy Exclamation Mark S + (0x2795, 0x2797,), # Heavy Plus Sign ..Heavy Division Sign + (0x27b0, 0x27b0,), # Curly Loop ..Curly Loop + (0x27bf, 0x27bf,), # Double Curly Loop ..Double Curly Loop + (0x2b1b, 0x2b1c,), # Black Large Square ..White Large Square + (0x2b50, 0x2b50,), # White Medium Star ..White Medium Star + (0x2b55, 0x2b55,), # Heavy Large Circle ..Heavy Large Circle (0x2e80, 0x2e99,), # Cjk Radical Repeat ..Cjk Radical Rap (0x2e9b, 0x2ef3,), # Cjk Radical Choke ..Cjk Radical C-simplified (0x2f00, 0x2fd5,), # Kangxi Radical One ..Kangxi Radical Flute @@ -31,11 +64,49 @@ (0xfe68, 0xfe6b,), # Small Reverse Solidus ..Small Commercial At (0xff01, 0xff60,), # Fullwidth Exclamation Ma..Fullwidth Right White Pa (0xffe0, 0xffe6,), # Fullwidth Cent Sign ..Fullwidth Won Sign + (0x16fe0, 0x16fe0,), # (nil) .. + (0x17000, 0x187ec,), # (nil) .. + (0x18800, 0x18af2,), # (nil) .. (0x1b000, 0x1b001,), # Katakana Letter Archaic ..Hiragana Letter Archaic + (0x1f004, 0x1f004,), # Mahjong Tile Red Dragon ..Mahjong Tile Red Dragon + (0x1f0cf, 0x1f0cf,), # Playing Card Black Joker..Playing Card Black Joker + (0x1f18e, 0x1f18e,), # Negative Squared Ab ..Negative Squared Ab + (0x1f191, 0x1f19a,), # Squared Cl ..Squared Vs (0x1f200, 0x1f202,), # Square Hiragana Hoka ..Squared Katakana Sa - (0x1f210, 0x1f23a,), # Squared Cjk Unified Ideo..Squared Cjk Unified Ideo + (0x1f210, 0x1f23b,), # Squared Cjk Unified Ideo.. (0x1f240, 0x1f248,), # Tortoise Shell Bracketed..Tortoise Shell Bracketed (0x1f250, 0x1f251,), # Circled Ideograph Advant..Circled Ideograph Accept + (0x1f300, 0x1f320,), # Cyclone ..Shooting Star + (0x1f32d, 0x1f335,), # Hot Dog ..Cactus + (0x1f337, 0x1f37c,), # Tulip ..Baby Bottle + (0x1f37e, 0x1f393,), # Bottle With Popping Cork..Graduation Cap + (0x1f3a0, 0x1f3ca,), # Carousel Horse ..Swimmer + (0x1f3cf, 0x1f3d3,), # Cricket Bat And Ball ..Table Tennis Paddle And + (0x1f3e0, 0x1f3f0,), # House Building ..European Castle + (0x1f3f4, 0x1f3f4,), # Waving Black Flag ..Waving Black Flag + (0x1f3f8, 0x1f43e,), # Badminton Racquet And Sh..Paw Prints + (0x1f440, 0x1f440,), # Eyes ..Eyes + (0x1f442, 0x1f4fc,), # Ear ..Videocassette + (0x1f4ff, 0x1f53d,), # Prayer Beads ..Down-pointing Small Red + (0x1f54b, 0x1f54e,), # Kaaba ..Menorah With Nine Branch + (0x1f550, 0x1f567,), # Clock Face One Oclock ..Clock Face Twelve-thirty + (0x1f57a, 0x1f57a,), # (nil) .. + (0x1f595, 0x1f596,), # Reversed Hand With Middl..Raised Hand With Part Be + (0x1f5a4, 0x1f5a4,), # (nil) .. + (0x1f5fb, 0x1f64f,), # Mount Fuji ..Person With Folded Hands + (0x1f680, 0x1f6c5,), # Rocket ..Left Luggage + (0x1f6cc, 0x1f6cc,), # Sleeping Accommodation ..Sleeping Accommodation + (0x1f6d0, 0x1f6d2,), # Place Of Worship .. + (0x1f6eb, 0x1f6ec,), # Airplane Departure ..Airplane Arriving + (0x1f6f4, 0x1f6f6,), # (nil) .. + (0x1f910, 0x1f91e,), # Zipper-mouth Face .. + (0x1f920, 0x1f927,), # (nil) .. + (0x1f930, 0x1f930,), # (nil) .. + (0x1f933, 0x1f93e,), # (nil) .. + (0x1f940, 0x1f94b,), # (nil) .. + (0x1f950, 0x1f95e,), # (nil) .. + (0x1f980, 0x1f991,), # Crab .. + (0x1f9c0, 0x1f9c0,), # Cheese Wedge ..Cheese Wedge (0x20000, 0x2fffd,), # Cjk Unified Ideograph-20.. (0x30000, 0x3fffd,), # (nil) .. ) diff --git a/wcwidth/table_zero.py b/wcwidth/table_zero.py index 1e4f78d..2dcc267 100644 --- a/wcwidth/table_zero.py +++ b/wcwidth/table_zero.py @@ -1,7 +1,7 @@ """Zero_Width table. Created by setup.py.""" -# Generated: 2015-09-14T01:48:19.532217 -# Source: DerivedGeneralCategory-8.0.0.txt -# Date: 2015-02-13, 13:47:11 GMT [MD] +# Generated: 2016-07-02T04:20:28.075504 +# Source: DerivedGeneralCategory-9.0.0.txt +# Date: 2016-06-01, 10:34:26 GMT ZERO_WIDTH = ( (0x0300, 0x036f,), # Combining Grave Accent ..Combining Latin Small Le (0x0483, 0x0489,), # Combining Cyrillic Titlo..Combining Cyrillic Milli @@ -26,6 +26,7 @@ (0x0825, 0x0827,), # Samaritan Vowel Sign Sho..Samaritan Vowel Sign U (0x0829, 0x082d,), # Samaritan Vowel Sign Lon..Samaritan Mark Nequdaa (0x0859, 0x085b,), # Mandaic Affrication Mark..Mandaic Gemination Mark + (0x08d4, 0x08e1,), # (nil) .. (0x08e3, 0x0902,), # Arabic Turned Damma Belo..Devanagari Sign Anusvara (0x093a, 0x093a,), # Devanagari Vowel Sign Oe..Devanagari Vowel Sign Oe (0x093c, 0x093c,), # Devanagari Sign Nukta ..Devanagari Sign Nukta @@ -120,6 +121,7 @@ (0x17c9, 0x17d3,), # Khmer Sign Muusikatoan ..Khmer Sign Bathamasat (0x17dd, 0x17dd,), # Khmer Sign Atthacan ..Khmer Sign Atthacan (0x180b, 0x180d,), # Mongolian Free Variation..Mongolian Free Variation + (0x1885, 0x1886,), # Mongolian Letter Ali Gal..Mongolian Letter Ali Gal (0x18a9, 0x18a9,), # Mongolian Letter Ali Gal..Mongolian Letter Ali Gal (0x1920, 0x1922,), # Limbu Vowel Sign A ..Limbu Vowel Sign U (0x1927, 0x1928,), # Limbu Vowel Sign E ..Limbu Vowel Sign O @@ -158,7 +160,7 @@ (0x1cf4, 0x1cf4,), # Vedic Tone Candra Above ..Vedic Tone Candra Above (0x1cf8, 0x1cf9,), # Vedic Tone Ring Above ..Vedic Tone Double Ring A (0x1dc0, 0x1df5,), # Combining Dotted Grave A..Combining Up Tack Above - (0x1dfc, 0x1dff,), # Combining Double Inverte..Combining Right Arrowhea + (0x1dfb, 0x1dff,), # (nil) ..Combining Right Arrowhea (0x20d0, 0x20f0,), # Combining Left Harpoon A..Combining Asterisk Above (0x2cef, 0x2cf1,), # Coptic Combining Ni Abov..Coptic Combining Spiritu (0x2d7f, 0x2d7f,), # Tifinagh Consonant Joine..Tifinagh Consonant Joine @@ -173,7 +175,7 @@ (0xa806, 0xa806,), # Syloti Nagri Sign Hasant..Syloti Nagri Sign Hasant (0xa80b, 0xa80b,), # Syloti Nagri Sign Anusva..Syloti Nagri Sign Anusva (0xa825, 0xa826,), # Syloti Nagri Vowel Sign ..Syloti Nagri Vowel Sign - (0xa8c4, 0xa8c4,), # Saurashtra Sign Virama ..Saurashtra Sign Virama + (0xa8c4, 0xa8c5,), # Saurashtra Sign Virama .. (0xa8e0, 0xa8f1,), # Combining Devanagari Dig..Combining Devanagari Sig (0xa926, 0xa92d,), # Kayah Li Vowel Ue ..Kayah Li Tone Calya Plop (0xa947, 0xa951,), # Rejang Vowel Sign I ..Rejang Consonant Sign R @@ -225,6 +227,7 @@ (0x1122f, 0x11231,), # Khojki Vowel Sign U ..Khojki Vowel Sign Ai (0x11234, 0x11234,), # Khojki Sign Anusvara ..Khojki Sign Anusvara (0x11236, 0x11237,), # Khojki Sign Nukta ..Khojki Sign Shadda + (0x1123e, 0x1123e,), # (nil) .. (0x112df, 0x112df,), # Khudawadi Sign Anusvara ..Khudawadi Sign Anusvara (0x112e3, 0x112ea,), # Khudawadi Vowel Sign U ..Khudawadi Sign Virama (0x11300, 0x11301,), # Grantha Sign Combining A..Grantha Sign Candrabindu @@ -232,6 +235,9 @@ (0x11340, 0x11340,), # Grantha Vowel Sign Ii ..Grantha Vowel Sign Ii (0x11366, 0x1136c,), # Combining Grantha Digit ..Combining Grantha Digit (0x11370, 0x11374,), # Combining Grantha Letter..Combining Grantha Letter + (0x11438, 0x1143f,), # (nil) .. + (0x11442, 0x11444,), # (nil) .. + (0x11446, 0x11446,), # (nil) .. (0x114b3, 0x114b8,), # Tirhuta Vowel Sign U ..Tirhuta Vowel Sign Vocal (0x114ba, 0x114ba,), # Tirhuta Vowel Sign Short..Tirhuta Vowel Sign Short (0x114bf, 0x114c0,), # Tirhuta Sign Candrabindu..Tirhuta Sign Anusvara @@ -250,6 +256,13 @@ (0x1171d, 0x1171f,), # Ahom Consonant Sign Medi..Ahom Consonant Sign Medi (0x11722, 0x11725,), # Ahom Vowel Sign I ..Ahom Vowel Sign Uu (0x11727, 0x1172b,), # Ahom Vowel Sign Aw ..Ahom Sign Killer + (0x11c30, 0x11c36,), # (nil) .. + (0x11c38, 0x11c3d,), # (nil) .. + (0x11c3f, 0x11c3f,), # (nil) .. + (0x11c92, 0x11ca7,), # (nil) .. + (0x11caa, 0x11cb0,), # (nil) .. + (0x11cb2, 0x11cb3,), # (nil) .. + (0x11cb5, 0x11cb6,), # (nil) .. (0x16af0, 0x16af4,), # Bassa Vah Combining High..Bassa Vah Combining High (0x16b30, 0x16b36,), # Pahawh Hmong Mark Cim Tu..Pahawh Hmong Mark Cim Ta (0x16f8f, 0x16f92,), # Miao Tone Right ..Miao Tone Below @@ -265,6 +278,12 @@ (0x1da84, 0x1da84,), # Signwriting Location Hea..Signwriting Location Hea (0x1da9b, 0x1da9f,), # Signwriting Fill Modifie..Signwriting Fill Modifie (0x1daa1, 0x1daaf,), # Signwriting Rotation Mod..Signwriting Rotation Mod + (0x1e000, 0x1e006,), # (nil) .. + (0x1e008, 0x1e018,), # (nil) .. + (0x1e01b, 0x1e021,), # (nil) .. + (0x1e023, 0x1e024,), # (nil) .. + (0x1e026, 0x1e02a,), # (nil) .. (0x1e8d0, 0x1e8d6,), # Mende Kikakui Combining ..Mende Kikakui Combining + (0x1e944, 0x1e94a,), # (nil) .. (0xe0100, 0xe01ef,), # Variation Selector-17 ..Variation Selector-256 ) From 3cb396b555a91b422f75d3f4ce8a16e9fb58810c Mon Sep 17 00:00:00 2001 From: Jeff Quast Date: Fri, 1 Jul 2016 21:24:32 -0700 Subject: [PATCH 2/7] remove 'docs' target, we generate none, currently. --- README.rst | 2 +- tox.ini | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index 1ca84ae..61f6c4c 100644 --- a/README.rst +++ b/README.rst @@ -164,7 +164,7 @@ History ======= 0.1.7 *2016-07-01* - * **Updated** tables to Unicode Specification 9.0.0. + * **Updated** tables to Unicode Specification 9.0.0. (`PR #18`_). 0.1.6 *2016-01-08 Production/Stable* * ``LICENSE`` file now included with distribution. diff --git a/tox.ini b/tox.ini index cffdf40..c724c90 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27, py35, compile, check, docs, update +envlist = update, py27, py35, compile, check [testenv] deps = pytest @@ -14,9 +14,9 @@ deps = prospector usedevelop = true commands = prospector {posargs:--no-autodetect --die-on-tool-error} -[testenv:docs] -deps = sphinx -commands = sphinx-build docs/ +;[testenv:docs] +;deps = sphinx +;commands = sphinx-build docs/ [testenv:update] usedevelop = false From aa405743ad2c138061a1361fef23cee3b4400407 Mon Sep 17 00:00:00 2001 From: Jeff Quast Date: Fri, 1 Jul 2016 21:31:03 -0700 Subject: [PATCH 3/7] use 'check' target, not 'sa' --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index b0482f5..e5fd1da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,26 +6,26 @@ env: - TOXENV=py27 - TOXENV=py33 - TOXENV=py34 - - TOXENV=pypy + - TOXENV=py35 install: - pip install -q tox # for python version =33, cinstall and overage, coveralls. # coverage is only measured and published for one version. - - if [[ $TOXENV == "py34" ]]; then + - if [[ $TOXENV == "py35" ]]; then pip install -q coverage coveralls; fi script: - tox -e $TOXENV - - if [[ $TOXENV == "py34" ]]; then - tox -esa; + - if [[ $TOXENV == "py35" ]]; then + tox -echeck; fi after_success: - - if [[ $TOXENV == "py34" ]]; then + - if [[ $TOXENV == "py35" ]]; then coveralls; fi From 2345419d5703c68ad145445924de18334602ce96 Mon Sep 17 00:00:00 2001 From: Jeff Quast Date: Fri, 1 Jul 2016 21:33:01 -0700 Subject: [PATCH 4/7] remove dundant requirements in tox.ini --- tox.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index c724c90..97a365b 100644 --- a/tox.ini +++ b/tox.ini @@ -9,8 +9,7 @@ commands = {posargs:py.test} commands = python -m compileall {toxinidir}/wcwidth [testenv:check] -deps = prospector - -rrequirements-develop.txt +deps = -rrequirements-develop.txt usedevelop = true commands = prospector {posargs:--no-autodetect --die-on-tool-error} From b66c36181d5d80075584c7b1081e658a62cbcc8f Mon Sep 17 00:00:00 2001 From: Jeff Quast Date: Fri, 1 Jul 2016 21:35:11 -0700 Subject: [PATCH 5/7] travis-ci attempt: declare 3.5 requisite? --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index e5fd1da..f6ac144 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,12 @@ language: python +python: + - "2.6" + - "2.7" + - "3.2" + - "3.3" + - "3.4" + - "3.5" + sudo: false env: From e98cbd4a50c9c245ce001f47785b1d6c60a8c285 Mon Sep 17 00:00:00 2001 From: Jeff Quast Date: Fri, 1 Jul 2016 21:36:35 -0700 Subject: [PATCH 6/7] that was a terrible idea, revert! --- .travis.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index f6ac144..f54a821 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,4 @@ language: python -python: - - "2.6" - - "2.7" - - "3.2" - - "3.3" - - "3.4" - - "3.5" sudo: false From 412135b98777e1292b2fc06a50dbe4fe415874f5 Mon Sep 17 00:00:00 2001 From: Jeff Quast Date: Fri, 1 Jul 2016 21:37:09 -0700 Subject: [PATCH 7/7] continue with py34, travis-ci is weird --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f54a821..a52cfd8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,26 +7,25 @@ env: - TOXENV=py27 - TOXENV=py33 - TOXENV=py34 - - TOXENV=py35 install: - pip install -q tox # for python version =33, cinstall and overage, coveralls. # coverage is only measured and published for one version. - - if [[ $TOXENV == "py35" ]]; then + - if [[ $TOXENV == "py34" ]]; then pip install -q coverage coveralls; fi script: - tox -e $TOXENV - - if [[ $TOXENV == "py35" ]]; then + - if [[ $TOXENV == "py34" ]]; then tox -echeck; fi after_success: - - if [[ $TOXENV == "py35" ]]; then + - if [[ $TOXENV == "py34" ]]; then coveralls; fi