Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ameshアップデート2022/05 (マージできる状態にした) #1698

Closed
wants to merge 111 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
0bd1cc7
新しいマップエンジンにする
m77so May 7, 2022
12217bf
鳩は唐揚げ!(自動で直してあげたよ!)
github-actions[bot] May 7, 2022
85b5ed0
Merge pull request #998 from dev-hato/fix-format-amesh-new-engine
m77so May 7, 2022
5b1536c
fix module path
m77so May 7, 2022
3a392f5
add opencv, update pillow
m77so May 7, 2022
4cb976d
pr-formatでPipfile.lockの差分のPRが出るようにする
massongit May 7, 2022
a3babc1
条件修正
massongit May 7, 2022
72f69e6
Merge pull request #999 from dev-hato/fix_format_ci
massongit May 7, 2022
db9371f
鳩は唐揚げ!(自動で直してあげたよ!)
github-actions[bot] May 7, 2022
5091bc8
Merge pull request #1002 from dev-hato/fix-format-amesh-new-engine
m77so May 7, 2022
114893c
add opencv lib
m77so May 7, 2022
8039b96
fix
m77so May 7, 2022
452bc1f
fix library path
m77so May 7, 2022
6b69c3d
fix timestamp
m77so May 7, 2022
a9bc17e
fix for test
m77so May 7, 2022
8624746
Update library/hatomap.py
m77so May 7, 2022
5fec142
fix inttelij linter
m77so May 7, 2022
61da57e
fix for test
m77so May 7, 2022
e453152
鳩は唐揚げ!(自動で直してあげたよ!)
github-actions[bot] May 7, 2022
a65fcf0
Merge pull request #1005 from dev-hato/fix-format-amesh-new-engine
m77so May 7, 2022
02b6288
apply review
m77so May 7, 2022
49cb33d
Merge branch 'amesh-new-engine' of github.com:dev-hato/hato-bot into …
m77so May 7, 2022
6a8b889
dont check cv2
m77so May 7, 2022
f80cd38
apply linter
m77so May 7, 2022
17363e1
Update library/jma_amesh.py
m77so May 7, 2022
3f30c99
fix cv2
m77so May 7, 2022
ff56f7f
Merge branch 'amesh-new-engine' of github.com:dev-hato/hato-bot into …
m77so May 7, 2022
3e7eb8a
Update .python-lint
m77so May 7, 2022
8e517a7
Update library/hatomap.py
m77so May 7, 2022
ab4574d
鳩は唐揚げ!(自動で直してあげたよ!)
github-actions[bot] May 7, 2022
5c99d08
Merge pull request #1006 from dev-hato/fix-format-amesh-new-engine
m77so May 8, 2022
48c0faf
fix for cv2
m77so May 10, 2022
40a3331
add alpha
m77so May 10, 2022
1111974
Merge branch 'develop' into amesh-new-engine
m77so Jun 4, 2022
a7e56d9
鳩は唐揚げ!(自動で直してあげたよ!)
github-actions[bot] Jun 4, 2022
5c5ce0f
Merge pull request #1048 from dev-hato/fix-version-pre-commit-config-…
m77so Jun 4, 2022
7229fa2
鳩は唐揚げ!(自動で直してあげたよ!)
github-actions[bot] Jun 4, 2022
a1a0bf7
Merge pull request #1008 from dev-hato/fix-format-amesh-new-engine
nakkaa Jul 15, 2022
c8f61eb
merge commit
m77so Jul 29, 2022
b46caf4
Merge branch 'develop' into amesh-new-engine
m77so Jul 29, 2022
6ca6206
formatが間違ってたので直してあげたよ!
github-actions[bot] Jul 29, 2022
775e68f
Merge pull request #1299 from dev-hato/fix-format-amesh-new-engine
m77so Aug 2, 2022
c271f30
fix git
m77so Aug 2, 2022
83e343a
formatが間違ってたので直してあげたよ!
github-actions[bot] Aug 2, 2022
2e42d45
Merge pull request #1309 from dev-hato/fix-format-amesh-new-engine
m77so Aug 2, 2022
3e66b2e
add ipa font license files
m77so Aug 2, 2022
8dec1c4
fix super linter format
m77so Aug 2, 2022
4ebd592
formatが間違ってたので直してあげたよ!
github-actions[bot] Aug 2, 2022
4c23a4a
Merge pull request #1310 from dev-hato/fix-format-amesh-new-engine
m77so Aug 2, 2022
b54855d
Merge branch 'develop' into amesh-new-engine
massongit Oct 16, 2022
44addf5
formatが間違ってたので直してあげたよ!
github-actions[bot] Oct 16, 2022
c3d716a
Merge pull request #1699 from dev-hato/fix-format-amesh-new-engine_2
massongit Oct 16, 2022
2b3da01
テスト修正
massongit Oct 16, 2022
c72b842
テスト修正
massongit Oct 16, 2022
6662c55
formatが間違ってたので直してあげたよ!
github-actions[bot] Oct 16, 2022
d0245da
Merge pull request #1700 from dev-hato/fix-format-amesh-new-engine_2
massongit Oct 16, 2022
7beeeb2
super-linterによる指摘事項修正
massongit Oct 16, 2022
1d1fa49
super-linterによる指摘事項修正
massongit Oct 16, 2022
a34bb56
formatが間違ってたので直してあげたよ!
github-actions[bot] Oct 16, 2022
bd2842b
Merge pull request #1702 from dev-hato/fix-format-json-yml-amesh-new-…
massongit Oct 16, 2022
8fca633
formatが間違ってたので直してあげたよ!
github-actions[bot] Oct 16, 2022
ab266a5
Merge pull request #1703 from dev-hato/fix-format-amesh-new-engine_2
massongit Oct 16, 2022
2e40b35
Merge branch 'develop' into amesh-new-engine_2
massongit Oct 16, 2022
8a06e71
super-linterによる指摘事項修正
massongit Oct 16, 2022
3a34ab3
formatが間違ってたので直してあげたよ!
github-actions[bot] Oct 16, 2022
ddf2065
Merge pull request #1705 from dev-hato/fix-format-amesh-new-engine_2
massongit Oct 16, 2022
c676b3f
super-linterによる指摘事項修正
massongit Oct 16, 2022
844311b
super-linterによる指摘事項修正
massongit Oct 16, 2022
23621c1
例外の型変更
massongit Oct 16, 2022
ade2b11
super-linterによる指摘事項修正
massongit Oct 16, 2022
c73f33a
None判定修正
massongit Oct 16, 2022
e6e568d
タイル画像取得時にUser Agentを付与する
massongit Oct 16, 2022
618b648
formatが間違ってたので直してあげたよ!
github-actions[bot] Oct 16, 2022
76a978c
Merge pull request #1707 from dev-hato/fix-format-amesh-new-engine_2
massongit Oct 16, 2022
090b6c4
使用していないフィールド削除
massongit Oct 16, 2022
26ac051
余分な変更を元に戻す
massongit Oct 16, 2022
fd9d3f8
余分な変更を元に戻す
massongit Oct 16, 2022
6e340e5
formatが間違ってたので直してあげたよ!
github-actions[bot] Oct 16, 2022
f2a9d43
Merge pull request #1712 from dev-hato/fix-format-amesh-new-engine_2
massongit Oct 16, 2022
eb836f9
自明な型の表記削除
massongit Oct 16, 2022
cd4c46d
height, widthの指定を必須にする
massongit Oct 16, 2022
7a76501
テスト用画像から余分な情報を落とす
massongit Oct 16, 2022
27985eb
textsize -> textbbox
massongit Oct 16, 2022
b477fd2
Merge branch 'develop' into amesh-new-engine_2
massongit Oct 16, 2022
c0a1271
Merge branch 'develop' into amesh-new-engine_2
massongit Oct 16, 2022
84521b4
余分な変更を元に戻す
massongit Oct 17, 2022
4f12d61
Merge branch 'develop' into amesh-new-engine_2
massongit Oct 20, 2022
da32d3b
formatが間違ってたので直してあげたよ!
github-actions[bot] Oct 20, 2022
4ecf22e
Merge pull request #1736 from dev-hato/fix-format-amesh-new-engine_2
massongit Oct 20, 2022
b494e9c
Merge branch 'develop' into amesh-new-engine_2
massongit Oct 21, 2022
775f7e4
formatが間違ってたので直してあげたよ!
github-actions[bot] Oct 21, 2022
40410b0
Merge pull request #1743 from dev-hato/fix-format-amesh-new-engine_2
massongit Oct 21, 2022
84c99e8
Merge branch 'develop' into amesh-new-engine_2
massongit Oct 26, 2022
1695f5d
formatが間違ってたので直してあげたよ!
github-actions[bot] Oct 26, 2022
27aa9a7
Merge pull request #1763 from dev-hato/fix-format-amesh-new-engine_2
massongit Oct 26, 2022
b78c3ce
Merge branch 'develop' into amesh-new-engine_2
massongit Oct 26, 2022
5a2d1f9
Merge branch 'develop' into amesh-new-engine_2
massongit Nov 2, 2022
21ca761
formatが間違ってたので直してあげたよ!
github-actions[bot] Nov 2, 2022
7f328c2
Merge pull request #1792 from dev-hato/fix-format-amesh-new-engine_2
massongit Nov 2, 2022
ca16ce4
Merge branch 'develop' into amesh-new-engine_2
massongit Nov 3, 2022
d9f7122
formatが間違ってたので直してあげたよ!
github-actions[bot] Nov 3, 2022
f65d97b
Merge pull request #1798 from dev-hato/fix-format-amesh-new-engine_2
massongit Nov 3, 2022
f75b20e
Merge branch 'develop' into amesh-new-engine_2
massongit Nov 4, 2022
0e5da5e
formatが間違ってたので直してあげたよ!
github-actions[bot] Nov 4, 2022
f2c554e
Merge pull request #1827 from dev-hato/fix-format-amesh-new-engine_2
massongit Nov 4, 2022
2cfe3d5
Merge branch 'develop' into amesh-new-engine_2
massongit Nov 4, 2022
39f2754
default_factoryで設定する
massongit Nov 5, 2022
481c3eb
Merge branch 'develop' into amesh-new-engine_2
massongit Nov 5, 2022
83419e5
formatが間違ってたので直してあげたよ!
github-actions[bot] Nov 5, 2022
7ef84bb
Merge pull request #1834 from dev-hato/fix-format-amesh-new-engine_2
massongit Nov 5, 2022
b99774a
default_factoryで設定する
massongit Nov 5, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
鳩は唐揚げ!(自動で直してあげたよ!)
github-actions[bot] committed May 7, 2022
commit e45315239c8b717f07abd7128cd8cfb4795d553e
18 changes: 10 additions & 8 deletions tests/plugins/test_hato.py
Original file line number Diff line number Diff line change
@@ -79,8 +79,10 @@ def get_amesh_test(self,
jma_image_url = re.compile(
r'www\.jma\.go\.jp/bosai/jmatile/data/nowc/.+\.png')
osm_image_url = re.compile(r'tile\.openstreetmap\.org/.+\.png')
jma_json_url = re.compile(r'www.jma.go.jp/bosai/jmatile/data/nowc/targetTimes_N\d.json')
liden_json_url = re.compile(r'www.jma.go.jp/bosai/jmatile/data/nowc/.+/liden/data.geojson')
jma_json_url = re.compile(
r'www.jma.go.jp/bosai/jmatile/data/nowc/targetTimes_N\d.json')
liden_json_url = re.compile(
r'www.jma.go.jp/bosai/jmatile/data/nowc/.+/liden/data.geojson')
mocker.get(jma_image_url, content=image_content)
mocker.get(osm_image_url, content=image_content)
mocker.get(jma_json_url, content=json_content)
@@ -103,13 +105,13 @@ def amesh_upload_png_test(self,
with open(os.path.join(os.path.dirname(__file__),
'test_targetTimes_N1.json'), mode='rb') as json_file:
with open(os.path.join(os.path.dirname(__file__),
'test_liden_data.geojson'), mode='rb') as liden_json_file:
'test_liden_data.geojson'), mode='rb') as liden_json_file:
client1 = self.get_amesh_test(mocker,
place,
image_content=picture_file.read(),
json_content=json_file.read(),
liden_json_content=liden_json_file.read()
)
place,
image_content=picture_file.read(),
json_content=json_file.read(),
liden_json_content=liden_json_file.read()
)
self.assertEqual(client1.get_post_message(), msg)
self.assertEqual(client1.get_filename(), 'amesh.png')