search

seisman / SAC_Docs_zh

SAC参考手册中文版
https://seisman.github.io/SAC_Docs_zh
59 stars 29 forks source link

Update for SAC 102.0 #149

Open seisman opened 3 years ago

seisman commented 3 years ago

SAC 102.0 was released recently. There are some big changes in the SAC file format, new features and bug-fixes. We need to add these new contents to the manual.

sean0921 commented 3 years ago

Related self-packaging script is updated: https://github.com/sean0921/sac_debian_packager/tree/102.0-1%2Bsdp1.1

core-man commented 3 years ago

Do we really want to update sac to 102? I think SAC101.6 is enough and we should use ObsPy first in the future (Originally posted in https://github.com/seisman/SAC_Docs_zh/pull/155#issuecomment-822214512)? 我会建议老用户尽量使用 SAC 101.6，而不使用 SAC 102。

wangliang1989 commented 3 years ago

Do we really want to update sac to 102? I think SAC101.6 is enough and we should use ObsPy first in the future (Originally posted in #155 (comment))? 我会建议老用户尽量使用 SAC 101.6，而不使用 SAC 102。

新老用户都应该用102

core-man commented 3 years ago

Shall we submit some PRs to dev branch so that the migration to SAC102 is smooth? Currently, dev only contains SAC102 installation. We might need to simply change 101.6 to 102.0 for the following files (grep 101.6 source/*/*rst):

Just want to cross-reference. @wangliang1989 is helping with SAC102 updating in https://github.com/seisman/SAC_Docs_zh/issues/213#issuecomment-853040665 and https://github.com/seisman/SAC_Docs_zh/issues/213#issuecomment-855735728, which need more work and revisions instead of simply changing 101.6 to 102.0. I may move some TODOs into the two comments.

wangliang1989 commented 3 years ago

你的英文我不是完全看得懂

我觉得应该先让dev和master分支一致。然后我继续向dev分支发pr。这两步应该都会有冲突，分别解决。先让dev和master的合并是我希望102的内容在git历史中看上去是在最近发布的release的后面

core-man commented 3 years ago

我觉得应该先让dev和master分支一致。然后我继续向dev分支发pr。这两步应该都会有冲突，分别解决。先让dev和master的合并是我希望102的内容在git历史中看上去是在最近发布的release的后面

是的，现在不能直接提交PR 并直接merge到master上。

我猜 @seisman 会很快在 #174 中让 dev 和 master 分支同步的。同步以后，#232 和 #241 就可以逐步审稿merge到dev了。

seisman commented 3 years ago

以后的 PR 会直接 merge 到 master 分支。