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.

Sign up for GitHub

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

Jump to bottom

Import c2a-enum-loader #99

Merged
merged 59 commits into from
Sep 27, 2023
Merged

Import c2a-enum-loader #99

merged 59 commits into from
Sep 27, 2023

Conversation

sksat
Copy link
Member

@sksat sksat commented Sep 21, 2023 •
edited
Loading

概要

ut-issl/c2a-enum-loader を吸収合併します

Issue

詳細

git merge -s ours して ut-issl/c2a-enum-loader を commit history 毎吸収合併しました．

また，

  • ドキュメントの更新: e54af28
  • black でのフォーマットチェックが落ちていたのでフォーマット: a47de05
  • enum-loader/.github 以下のファイルは不要なので削除: 3c0a55d
  • ライセンスファイルはリポジトリトップのもので十分なはずなので削除: 684b573
    • ライセンスの扱いは注意が必要なので，丁寧に commit message 書いてます
  • example user の pytest の dependencies の c2aenum を切り替え: 9b38a88

を追加で実施しました

検証結果

pytest CI が通ればよし

影響範囲

c2a-enum-loader の管理が c2a-core リポジトリに移る

補足

#100 で書いたように，rye lock で絶対パスでの参照が生成されてしまっているが，これは一旦許容する（ローカルでも CI 上でも，pytest の手順としては rye sync を前提としており，lockfile は現状参考程度のものでしかないため）

meltingrabbit and others added 30 commits November 26, 2021 18:29
@meltingrabbit
Initial commit
ca9d938
@meltingrabbit
add initial commit
eaff52b
@meltingrabbit
Create LICENSE
c44268d
@meltingrabbit
fix path
c65069a
@meltingrabbit
fix regular expression to get last enumerator
26bfc6e
@meltingrabbit
change to raw string
cb0ef61
@meltingrabbit
support for enums without id
604d85d
@meltingrabbit
fix small
e47f860
@meltingrabbit
fix enum origin
3bd46bb
@meltingrabbit
Merge pull request #3 from ut-issl/feature/update_for_getting_last_enum
31ecf0b 
enumの取得方法を改善
@meltingrabbit
add el, eh enum
55b26df
@meltingrabbit
Merge pull request #4 from ut-issl/feature/add_eh_el_enum
2c64ac5 
EL, EHのenumを追加
@meltingrabbit
fix func name
f360fb1
@meltingrabbit
Merge pull request #6 from ut-issl/feature/fix_func_name
acbb8b4 
関数名修正 & 不要な関数の削除
@meltingrabbit
rename to TlmCmd from CmdTlm
b6cf6f0
@meltingrabbit
Merge pull request #7 from ut-issl/feature/rename_tlmcmd
58c8ca9 
CmdTlmとなってる部分を，TlmCmdにする
@meltingrabbit
support utf-8
dc29dfe
@meltingrabbit
Merge pull request #8 from ut-issl/feature/support_utf-8
c3ddac4 
入力ソースコードファイルの文字コードを指定できるように
@meltingrabbit
add black and flake8 settings
046c1bf
@meltingrabbit
apply black
ae7a22c
@meltingrabbit
fix F401
6a3ab71
@meltingrabbit
add E501 to ignore for flake8
3327269
@meltingrabbit
Merge pull request #9 from ut-issl/feature/add_black_and_flake8_ci
e18a138 
Add formatter (black) and linter (flake8)
@renovate-bot
Add renovate.json
59b8fcc
@meltingrabbit
Merge pull request #10 from ut-issl/renovate/configure
395e50d 
Configure Renovate
@renovate-bot
Update actions/checkout action to v3
2914633
@renovate-bot
Update actions/setup-python action to v3
c451e4c
@meltingrabbit
Merge pull request #12 from ut-issl/renovate/actions-setup-python-3.x
1cea0c9 
Update actions/setup-python action to v3
@renovate-bot
Update reviewdog/action-black action to v3
b909384
@meltingrabbit
Merge pull request #14 from ut-issl/renovate/reviewdog-action-black-3.x
0d45ea7 
Update reviewdog/action-black action to v3
@sksat sksat force-pushed the feature/import-c2a-enum-loader branch from 8ab15f1 to e54af28 Compare September 25, 2023 08:35
@sksat
Copy link
Member Author

sksat commented Sep 25, 2023 

$ git merge -s ours c2a-enum-loader/ae-v4 --allow-unrelated-histories
$ git read-tree --prefix=enum-loader/ -u c2a-enum-loader/ae-v4
$ git commit -am "import ut-issl/c2a-enum-loader ae-v2.0.0"
$ git cherry-pick 8ab15f1e77494b4d1042c81c5410730b355ea325

@sksat
format by black
a47de05
@sksat
remove unneeded ut-issl/c2a-enum-loader repo files
3c0a55d
@sksat
remove duplicated license file
684b573 
Both c2a-core and c2a-enum-loader are forked from ut-issl and will be maintained together in arkedge/c2a-core.
The license displayed in this license file will be completely the same as the license at the top of arkedge/c2a-core.
@sksat
Copy link
Member Author

sksat commented Sep 25, 2023 •
edited
Loading

単純に ut-issl/c2a-enum-loader の履歴を吸収した他，

  • ドキュメントの更新: e54af28
  • black でのフォーマットチェックが落ちていたのでフォーマット: a47de05
  • enum-loader/.github 以下のファイルは不要なので削除: 3c0a55d
  • ライセンスファイルはリポジトリトップのもので十分なはずなので削除: 684b573
    • ライセンスの扱いは注意が必要なので，丁寧に commit message 書いてます
  • example user の pytest の dependencies の c2aenum を切り替え: 9b38a88

を追加で実施した

meltingrabbit
meltingrabbit reviewed Sep 27, 2023
View reviewed changes
CHANGELOG.md
@@ -25,6 +25,8 @@
- `Script/CI/check_coding_rule.json` ないし `script/ci/check_coding_rule.json` を C2A user のトップディレクトリに移動
- 設定ファイルから `c2a_root_dir` を削除
- 設定ファイル中のディレクトリの設定を C2A user のトップディレクトリからの相対パスに変更
- [ut-issl/c2a-enum-loader](https://github.com/ut-issl/c2a-enum-loader) を c2a-core リポジトリで管理するように変更: [#99](https://github.com/arkedge/c2a-core/pull/99)
- import したバージョン: [ut-issl/c2a-enum-loader ae-v2.0.0](https://github.com/ut-issl/c2a-enum-loader/releases/tag/ae-v2.0.0)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

これ，ISSL側の ae-v* リリースってこの後どうするの？（もうここではリリースしません宣言，どこでするのだ？と）

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

そっちはそもそも例外対応でしかないので，あんまり必要ないと思ってた．強いて言えば ae-v2.0.0 にこの PR 貼るぐらいでは．

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK

強いて言えば ae-v2.0.0 にこの PR 貼るぐらいでは．

これはしたいね

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ではこの PR がマージされたらリンクは貼っておきます

@meltingrabbit meltingrabbit mentioned this pull request Sep 27, 2023
Open
This was referenced Sep 27, 2023
Open
Open
meltingrabbit
meltingrabbit approved these changes Sep 27, 2023
View reviewed changes
Copy link
Member

@meltingrabbit meltingrabbit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

ae-v2.0.0 のリリースノートの修正だけお願いします

@sksat
Copy link
Member Author

sksat commented Sep 27, 2023

ut-issl/c2a-enum-loader の ae-v2.0.0 のリリースノート，の話ですよね？ > リリースノートの修正

@sksat sksat merged commit 3b15be9 into develop Sep 27, 2023
33 checks passed
@sksat sksat deleted the feature/import-c2a-enum-loader branch September 27, 2023 08:29
@sksat sksat linked an issue Oct 12, 2023 that may be closed by this pull request
c2a-enum-loader を吸収合併する #58
Closed
@sksat sksat mentioned this pull request Oct 12, 2023
Closed
@meltingrabbit meltingrabbit mentioned this pull request Nov 1, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@meltingrabbit meltingrabbit meltingrabbit approved these changes

Assignees

@sksat sksat

Labels
enhancement New feature or request priority::high priorityg high tools
Projects
C2A public
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

c2a-enum-loader を吸収合併する
4 participants
@sksat @meltingrabbit @renovate-bot @chutaro