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 #997

Merged
merged 49 commits into from
Nov 5, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 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
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
4 changes: 2 additions & 2 deletions .python-lint
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ errors-only=
# A comma-separated list of package or module names from where C extensions may
# be loaded. Extensions are loading into the active Python interpreter and may
# run arbitrary code
extension-pkg-whitelist=
extension-pkg-allow-list=cv2

# Add files or directories to the blacklist. They should be base names, not
# paths.
Expand Down Expand Up @@ -154,7 +154,7 @@ contextmanager-decorators=contextlib.contextmanager
# List of members which are set dynamically and missed by pylint inference
# system, and so shouldn't trigger E1101 when accessed. Python regular
# expressions are accepted.
generated-members=
generated-members=cv2

# Tells whether missing members accessed in mixin class should be ignored. A
# mixin class is detected if its name ends with "mixin" (case insensitive).
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ COPY Pipfile Pipfile
# 必要なパッケージ
# * git: Pythonライブラリのインストールの際に必要
# * curl: ヘルスチェックの際に必要
# * libopencv-dev: OpenCV
RUN apt-get update && \
apt-get install -y --no-install-recommends git curl && \
apt-get install -y --no-install-recommends git libopencv-dev curl && \
pip install pipenv==2022.7.24 --no-cache-dir && \
pipenv install --system --skip-lock && \
pip uninstall -y pipenv virtualenv && \
Expand Down
1 change: 1 addition & 0 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ mypy = "==0.971"
python-dotenv = "==0.20.0"
requests = "==2.28.1"
Pillow = ">=7.1.2"
opencv-python = "==4.5.5.64"
pyperclip = "==1.8.2"
click = "==8.1.3"
sudden-death = {git = "https://github.com/dev-hato/sudden-death", ref = "master"}
Expand Down
209 changes: 111 additions & 98 deletions Pipfile.lock

Large diffs are not rendered by default.

117 changes: 117 additions & 0 deletions library/assets/IPA_Font_License_Agreement_v1.0.txt

Large diffs are not rendered by default.

35 changes: 35 additions & 0 deletions library/assets/Readme_ipag00303.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
IPAフォント(IPAゴシック)
― はじめにお読みください ―

IPAフォント(Ver.3)は、JIS X 0213:2004に準拠したTrueTypeベースのOpenTypeフォントです。

IPAフォント(Ver.3)の使用または利用に当たっては、添付の「IPAフォントライセンスv1.0」に定める条件に従ってください。
IPAフォント(Ver.3)を使用し、複製し、または頒布する行為、その他、「IPAフォントライセンスv1.0」に定める権利の利用を行った場合、受領者は「IPAフォントライセンスv1.0」に同意したものと見なします。


IPAフォント(IPAゴシック) ipag00303.zip
|--はじめにお読みください Readme_ipag00303.txt
|--IPAフォントライセンスv1.0 IPA_Font_License_Agreement_v1.0.txt
|--IPAゴシック ipag.ttf


「IPAフォント」は、IPAの登録商標です。

=========================
IPA Font (IPAGothic)
-- Readme --

IPA Fonts are JIS X 0213:2004 compliant TrueType based OpenType format outline fonts.

In using IPA fonts, please comply with the terms and conditions set out in "IPA Font License Agreement v1.0" included in this package.
Any use, reproduction or distribution of the IPA Font or any exercise of rights under "IPA Font License Agreement v1.0" by a Recipient constitutes the Recipient's acceptance of the License Agreement.


IPA Font (IPAGothic) ipag00303.zip
|--Readme Readme_ipag00303.txt
|--IPA Font License Agreement v1.0 IPA_Font_License_Agreement_v1.0.txt
|--IPAGothic ipag.ttf


"IPA Font" is a registered trademark of IPA in Japan.

Binary file added library/assets/ipag.ttf
Binary file not shown.
Loading