From a90f98b942b5228fa3d985a672bbe397024cc2ca Mon Sep 17 00:00:00 2001 From: Yuuki Toriyama Date: Sun, 19 Jan 2025 16:43:07 +0900 Subject: [PATCH 1/7] =?UTF-8?q?update:=20#575:=20=E7=94=BA=E5=90=8D?= =?UTF-8?q?=E3=81=AE=E8=A7=A3=E6=9E=90=E5=87=A6=E7=90=86=E3=81=AB=E3=81=8A?= =?UTF-8?q?=E3=81=84=E3=81=A6=E3=80=8C=E9=BE=8D=E3=80=8D=E3=81=A8=E3=80=8C?= =?UTF-8?q?=E7=AB=9C=E3=80=8D=E3=81=AE=E8=A1=A8=E8=A8=98=E3=82=86=E3=82=8C?= =?UTF-8?q?=E3=81=AB=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/tokenizer/read_town.rs | 2 +- ...75\223\343\201\270\343\201\256\345\257\276\345\277\234.csv" | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/tokenizer/read_town.rs b/core/src/tokenizer/read_town.rs index 42f1195..716ea7a 100644 --- a/core/src/tokenizer/read_town.rs +++ b/core/src/tokenizer/read_town.rs @@ -63,7 +63,7 @@ fn find_town(input: &str, candidates: &Vec) -> Option<(String, String)> let adapter = OrthographicalVariantAdapter { variant_list: vec![ の, ツ, ケ, 薮, 崎, 檜, 竈, 舘, 鰺, 脊, 渕, 己, 槇, 治, 佛, 澤, 恵, 穂, 梼, 蛍, 與, - 瀧, 籠, 濱, 祗, 曾, 國, 鉋, 鷆, 斑, 櫻, 櫟, 冨, 鶯, + 瀧, 籠, 濱, 祗, 曾, 國, 鉋, 鷆, 斑, 櫻, 櫟, 冨, 鶯, 龍, ], }; if let Some(result) = adapter.apply(input, candidate) { diff --git "a/tests/test_data/\347\225\260\345\255\227\344\275\223\346\227\247\345\255\227\344\275\223\343\201\270\343\201\256\345\257\276\345\277\234.csv" "b/tests/test_data/\347\225\260\345\255\227\344\275\223\346\227\247\345\255\227\344\275\223\343\201\270\343\201\256\345\257\276\345\277\234.csv" index cf355ad..6b04ea6 100644 --- "a/tests/test_data/\347\225\260\345\255\227\344\275\223\346\227\247\345\255\227\344\275\223\343\201\270\343\201\256\345\257\276\345\277\234.csv" +++ "b/tests/test_data/\347\225\260\345\255\227\344\275\223\346\227\247\345\255\227\344\275\223\343\201\270\343\201\256\345\257\276\345\277\234.csv" @@ -16,6 +16,9 @@ address,prefecture,city,town,rest 茨城県龍ケ崎市馴馬町5387,茨城県,龍ヶ崎市,馴馬町,5387 茨城県竜ヶ崎市馴馬町5387,茨城県,龍ヶ崎市,馴馬町,5387 茨城県竜ケ崎市馴馬町5387,茨城県,龍ヶ崎市,馴馬町,5387 +# 「龍」と「竜」の表記ゆれへの対応 +山梨県甲斐市龍地5141,山梨県,甲斐市,龍地,5141 +山梨県甲斐市竜地5141,山梨県,甲斐市,龍地,5141 # 「檜原」「桧原」の表記ゆれへの対応 東京都西多摩郡檜原村上元郷403,東京都,西多摩郡檜原村,上元郷,403 東京都西多摩郡桧原村上元郷403,東京都,西多摩郡檜原村,上元郷,403 From 1ba5a255c47457017b9860df5a2839e00b85517b Mon Sep 17 00:00:00 2001 From: Yuuki Toriyama Date: Sun, 19 Jan 2025 16:44:24 +0900 Subject: [PATCH 2/7] update-version: 0.2.2 -> 0.2.3 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 441f3a4..d445503 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ members = [ resolver = "2" [workspace.package] -version = "0.2.2" +version = "0.2.3" edition = "2021" description = "A library for processing addresses of Japan" repository = "https://github.com/YuukiToriyama/japanese-address-parser" From 7ccd98226df69fb1c1837ab59264ef9721636b74 Mon Sep 17 00:00:00 2001 From: Yuuki Toriyama Date: Sun, 19 Jan 2025 17:37:33 +0900 Subject: [PATCH 3/7] =?UTF-8?q?update:=20#581:=20=E7=94=BA=E5=90=8D?= =?UTF-8?q?=E3=81=AE=E8=A7=A3=E6=9E=90=E5=87=A6=E7=90=86=E3=81=AB=E3=81=8A?= =?UTF-8?q?=E3=81=84=E3=81=A6=E3=80=8C=E9=87=A1=E3=80=8D=E3=81=A8=E3=80=8C?= =?UTF-8?q?=E9=87=9C=E3=80=8D=E3=81=AE=E8=A1=A8=E8=A8=98=E3=82=86=E3=82=8C?= =?UTF-8?q?=E3=81=AB=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/adapter/orthographical_variant_adapter.rs | 2 +- ...75\223\343\201\270\343\201\256\345\257\276\345\277\234.csv" | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/adapter/orthographical_variant_adapter.rs b/core/src/adapter/orthographical_variant_adapter.rs index 76cab3b..99e08aa 100644 --- a/core/src/adapter/orthographical_variant_adapter.rs +++ b/core/src/adapter/orthographical_variant_adapter.rs @@ -52,7 +52,7 @@ impl OrthographicalVariant { 崎 => &['崎', '﨑'], 檜 => &['桧', '檜'], 龍 => &['龍', '竜'], - 竈 => &['竈', '竃', '釜'], + 竈 => &['竈', '竃', '釜', '釡'], 嶋 => &['嶋', '島'], 舘 => &['舘', '館'], 鰺 => &['鰺', '鯵'], diff --git "a/tests/test_data/\347\225\260\345\255\227\344\275\223\346\227\247\345\255\227\344\275\223\343\201\270\343\201\256\345\257\276\345\277\234.csv" "b/tests/test_data/\347\225\260\345\255\227\344\275\223\346\227\247\345\255\227\344\275\223\343\201\270\343\201\256\345\257\276\345\277\234.csv" index 6b04ea6..e5ba25f 100644 --- "a/tests/test_data/\347\225\260\345\255\227\344\275\223\346\227\247\345\255\227\344\275\223\343\201\270\343\201\256\345\257\276\345\277\234.csv" +++ "b/tests/test_data/\347\225\260\345\255\227\344\275\223\346\227\247\345\255\227\344\275\223\343\201\270\343\201\256\345\257\276\345\277\234.csv" @@ -84,6 +84,9 @@ address,prefecture,city,town,rest # 「竃」と「竈」の表記ゆれへの対応 静岡県御殿場市竈1032,静岡県,御殿場市,竈,1032 静岡県御殿場市竃1032,静岡県,御殿場市,竈,1032 +# 「釜」と「釡」の表記ゆれへの対応 +山形県最上郡真室川町大字釜渕923,山形県,最上郡真室川町,大字釜渕,923 +山形県最上郡真室川町大字釡渕923,山形県,最上郡真室川町,大字釜渕,923 # 「小曾根」と「小曽根」の表記ゆれへの対応 埼玉県熊谷市小曽根1220,埼玉県,熊谷市,小曽根,1220 埼玉県熊谷市小曾根1220,埼玉県,熊谷市,小曽根,1220 From a8b83869eb67ff32a40041a6ef788703b1d99c0f Mon Sep 17 00:00:00 2001 From: Yuuki Toriyama Date: Sun, 19 Jan 2025 18:11:41 +0900 Subject: [PATCH 4/7] =?UTF-8?q?update:=20#551:=20=E5=A4=A7=E9=98=AA?= =?UTF-8?q?=E5=BA=9C=E3=81=AB=E3=81=8A=E3=81=91=E3=82=8B=E5=B8=82=E5=8C=BA?= =?UTF-8?q?=E7=94=BA=E6=9D=91=E5=90=8D=E3=81=AE=E8=A7=A3=E6=9E=90=E5=87=A6?= =?UTF-8?q?=E7=90=86=E3=81=A7=E3=80=8C=E6=A2=9D=E3=80=8D=E3=81=A8=E3=80=8C?= =?UTF-8?q?=E6=9D=A1=E3=80=8D=E3=81=AE=E8=A1=A8=E8=A8=98=E3=82=86=E3=82=8C?= =?UTF-8?q?=E3=82=92=E8=80=83=E6=85=AE=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/adapter/orthographical_variant_adapter.rs | 2 ++ core/src/tokenizer/read_city.rs | 1 + ...01\256\350\241\250\350\250\230\343\202\206\343\202\214.csv" | 3 +++ 3 files changed, 6 insertions(+) diff --git a/core/src/adapter/orthographical_variant_adapter.rs b/core/src/adapter/orthographical_variant_adapter.rs index 99e08aa..16937c4 100644 --- a/core/src/adapter/orthographical_variant_adapter.rs +++ b/core/src/adapter/orthographical_variant_adapter.rs @@ -39,6 +39,7 @@ pub enum OrthographicalVariant { 諫, 驒, 鶯, + 條, } impl OrthographicalVariant { @@ -84,6 +85,7 @@ impl OrthographicalVariant { 諫 => &['諫', '諌'], 驒 => &['驒', '騨'], 鶯 => &['鶯', '鴬'], + 條 => &['條', '条'], } } diff --git a/core/src/tokenizer/read_city.rs b/core/src/tokenizer/read_city.rs index 8c6872d..3c8cf54 100644 --- a/core/src/tokenizer/read_city.rs +++ b/core/src/tokenizer/read_city.rs @@ -34,6 +34,7 @@ impl Tokenizer { "茨城県" => vec![龍, 嶋], "東京都" => vec![檜], "岐阜県" => vec![驒], + "大阪府" => vec![條], "兵庫県" => vec![塚], "高知県" => vec![梼], "福岡県" => vec![恵], diff --git "a/tests/test_data/\345\270\202\345\214\272\347\224\272\346\235\221\345\220\215\343\203\254\343\203\231\343\203\253\343\201\247\343\201\256\350\241\250\350\250\230\343\202\206\343\202\214.csv" "b/tests/test_data/\345\270\202\345\214\272\347\224\272\346\235\221\345\220\215\343\203\254\343\203\231\343\203\253\343\201\247\343\201\256\350\241\250\350\250\230\343\202\206\343\202\214.csv" index 747775c..d74ffe0 100644 --- "a/tests/test_data/\345\270\202\345\214\272\347\224\272\346\235\221\345\220\215\343\203\254\343\203\231\343\203\253\343\201\247\343\201\256\350\241\250\350\250\230\343\202\206\343\202\214.csv" +++ "b/tests/test_data/\345\270\202\345\214\272\347\224\272\346\235\221\345\220\215\343\203\254\343\203\231\343\203\253\343\201\247\343\201\256\350\241\250\350\250\230\343\202\206\343\202\214.csv" @@ -11,6 +11,9 @@ address,prefecture,city,town,rest # 岐阜県 岐阜県飛騨市宮川町塩屋104,岐阜県,飛騨市,宮川町塩屋,104 岐阜県飛驒市宮川町塩屋104,岐阜県,飛騨市,宮川町塩屋,104 +# 大阪府 +大阪府四條畷市中野本町1番1号,大阪府,四條畷市,中野本町,1番1号 +大阪府四条畷市中野本町1番1号,大阪府,四條畷市,中野本町,1番1号 # 兵庫県 兵庫県宝塚市売布東の町8-19,兵庫県,宝塚市,売布東の町,8-19 兵庫県宝塚市売布東の町8-19,兵庫県,宝塚市,売布東の町,8-19 From 526ac92d625ac2c11f57a74a3b7e84dee44c97e6 Mon Sep 17 00:00:00 2001 From: Yuuki Toriyama Date: Sun, 19 Jan 2025 18:14:19 +0900 Subject: [PATCH 5/7] =?UTF-8?q?update:=20#551:=20=E5=A5=88=E8=89=AF?= =?UTF-8?q?=E7=9C=8C=E3=81=AB=E3=81=8A=E3=81=91=E3=82=8B=E5=B8=82=E5=8C=BA?= =?UTF-8?q?=E7=94=BA=E6=9D=91=E5=90=8D=E3=81=AE=E8=A7=A3=E6=9E=90=E5=87=A6?= =?UTF-8?q?=E7=90=86=E3=81=A7=E3=80=8C=E6=A2=9D=E3=80=8D=E3=81=A8=E3=80=8C?= =?UTF-8?q?=E6=9D=A1=E3=80=8D=E3=81=AE=E8=A1=A8=E8=A8=98=E3=82=86=E3=82=8C?= =?UTF-8?q?=E3=82=92=E8=80=83=E6=85=AE=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/tokenizer/read_city.rs | 1 + ...01\256\350\241\250\350\250\230\343\202\206\343\202\214.csv" | 3 +++ 2 files changed, 4 insertions(+) diff --git a/core/src/tokenizer/read_city.rs b/core/src/tokenizer/read_city.rs index 3c8cf54..52ee94f 100644 --- a/core/src/tokenizer/read_city.rs +++ b/core/src/tokenizer/read_city.rs @@ -36,6 +36,7 @@ impl Tokenizer { "岐阜県" => vec![驒], "大阪府" => vec![條], "兵庫県" => vec![塚], + "奈良県" => vec![條], "高知県" => vec![梼], "福岡県" => vec![恵], "長崎県" => vec![諫], diff --git "a/tests/test_data/\345\270\202\345\214\272\347\224\272\346\235\221\345\220\215\343\203\254\343\203\231\343\203\253\343\201\247\343\201\256\350\241\250\350\250\230\343\202\206\343\202\214.csv" "b/tests/test_data/\345\270\202\345\214\272\347\224\272\346\235\221\345\220\215\343\203\254\343\203\231\343\203\253\343\201\247\343\201\256\350\241\250\350\250\230\343\202\206\343\202\214.csv" index d74ffe0..9d1593c 100644 --- "a/tests/test_data/\345\270\202\345\214\272\347\224\272\346\235\221\345\220\215\343\203\254\343\203\231\343\203\253\343\201\247\343\201\256\350\241\250\350\250\230\343\202\206\343\202\214.csv" +++ "b/tests/test_data/\345\270\202\345\214\272\347\224\272\346\235\221\345\220\215\343\203\254\343\203\231\343\203\253\343\201\247\343\201\256\350\241\250\350\250\230\343\202\206\343\202\214.csv" @@ -19,6 +19,9 @@ address,prefecture,city,town,rest 兵庫県宝塚市売布東の町8-19,兵庫県,宝塚市,売布東の町,8-19 兵庫県宝塚市武庫川町1-1,兵庫県,宝塚市,武庫川町,1-1 兵庫県宝塚市武庫川町1-1,兵庫県,宝塚市,武庫川町,1-1 +# 奈良県 +奈良県五條市岡口1丁目3番1号,奈良県,五條市,岡口一丁目,3番1号 +奈良県五条市岡口1丁目3番1号,奈良県,五條市,岡口一丁目,3番1号 # 長崎県 長崎県諫早市東小路町7-1,長崎県,諫早市,東小路町,7-1 長崎県諌早市東小路町7-1,長崎県,諫早市,東小路町,7-1 From 39b18a8d92bdab9a09fadc2b845502bbe5e9f018 Mon Sep 17 00:00:00 2001 From: Yuuki Toriyama Date: Mon, 20 Jan 2025 21:44:30 +0900 Subject: [PATCH 6/7] =?UTF-8?q?update:=20maturin=E3=81=AE=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E5=A4=89=E6=9B=B4:=201.7.8?= =?UTF-8?q?=E3=81=8B=E3=82=891.8.1=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `upload-pypi-org.yaml` c.f. d18699b6 --- .github/workflows/upload-pypi-org.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/upload-pypi-org.yaml b/.github/workflows/upload-pypi-org.yaml index 17b39f9..4dff47f 100644 --- a/.github/workflows/upload-pypi-org.yaml +++ b/.github/workflows/upload-pypi-org.yaml @@ -38,7 +38,7 @@ jobs: - name: Build wheels uses: PyO3/maturin-action@v1 with: - maturin-version: 1.7.8 + maturin-version: 1.8.1 target: ${{ matrix.platform.target }} args: --release --out dist --zig working-directory: python @@ -68,7 +68,7 @@ jobs: - name: Build wheels uses: PyO3/maturin-action@v1 with: - maturin-version: 1.7.8 + maturin-version: 1.8.1 target: ${{ matrix.platform.target }} args: --release --out dist working-directory: python @@ -96,7 +96,7 @@ jobs: - name: Build wheels uses: PyO3/maturin-action@v1 with: - maturin-version: 1.7.8 + maturin-version: 1.8.1 target: ${{ matrix.platform.target }} args: --release --out dist working-directory: python @@ -114,7 +114,7 @@ jobs: - name: Build sdist uses: PyO3/maturin-action@v1 with: - maturin-version: 1.7.8 + maturin-version: 1.8.1 command: sdist args: --out dist working-directory: python @@ -137,6 +137,6 @@ jobs: MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }} MATURIN_REPOSITORY: "pypi" # test.pypi.orgにアップロードする際は"testpypi"を設定する with: - maturin-version: 1.7.8 + maturin-version: 1.8.1 command: upload args: --non-interactive --skip-existing wheels-*/* From 8faea6b18edb3d02a1496aeffef72d9fef9c9cc4 Mon Sep 17 00:00:00 2001 From: Yuuki Toriyama Date: Wed, 22 Jan 2025 08:27:31 +0900 Subject: [PATCH 7/7] =?UTF-8?q?update:=20maturin=E3=81=AE=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E5=A4=89=E6=9B=B4:=201.7.8?= =?UTF-8?q?=E3=81=8B=E3=82=891.8.1=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `python-build-check.yaml` c.f. acfeb3c0 --- .github/workflows/python-build-check.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/python-build-check.yaml b/.github/workflows/python-build-check.yaml index 41790d9..5a92236 100644 --- a/.github/workflows/python-build-check.yaml +++ b/.github/workflows/python-build-check.yaml @@ -27,7 +27,7 @@ jobs: - name: Build wheels uses: PyO3/maturin-action@v1 with: - maturin-version: 1.7.8 + maturin-version: 1.8.1 target: x86_64 args: --release --out dist --zig working-directory: python @@ -51,7 +51,7 @@ jobs: - name: Build wheels uses: PyO3/maturin-action@v1 with: - maturin-version: 1.7.8 + maturin-version: 1.8.1 target: x64 args: --release --out dist working-directory: python @@ -73,7 +73,7 @@ jobs: - name: Build wheels uses: PyO3/maturin-action@v1 with: - maturin-version: 1.7.8 + maturin-version: 1.8.1 target: aarch64 args: --release --out dist working-directory: python @@ -92,7 +92,7 @@ jobs: - name: Build sdist uses: PyO3/maturin-action@v1 with: - maturin-version: 1.7.8 + maturin-version: 1.8.1 command: sdist args: --out dist working-directory: python