Merge stable to develop 2024 #2323
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This changes the logic in testing.yml to always rebuild the environment for runs triggered by workflow_dispatch, while only triggering image rebuilds on push events.
matrss
requested changes
Apr 16, 2024
There was a problem hiding this comment.
There are multiple copyright notices that weren't changed:
$ git grep -n '\-202[23] '
mslib/mscolab/message_type.py:10: :copyright: Copyright 2019-2023 by the MSS team, see AUTHORS.
mslib/msui/msui_mainwindow.py:16: :copyright: Copyright 2016-2023 by the MSS team, see AUTHORS.
mslib/mswms/app/__init__.py:11: :copyright: Copyright 2016-2022 by the MSS team, see AUTHORS.
mslib/utils/migration/config_before_nine.py:13: :copyright: Copyright 2016-2023 by the MSS team, see AUTHORS.
mslib/utils/migration/update_json_file_to_version_nine.py:13: :copyright: Copyright 2016-2023 by the MSS team, see AUTHORS.
tests/__init__.py:12: :copyright: Copyright 2019-2022 by the MSS team, see AUTHORS.
tests/_test_mscolab/test_models.py:12: :copyright: Copyright 2019-2022 by the MSS team, see AUTHORS.
tests/_test_mscolab/test_server_auth_required.py:12: :copyright: Copyright 2020-2023 by the MSS team, see AUTHORS.
tests/_test_mswms/test_mswms.py:12: :copyright: Copyright 2022-2022 by the MSS team, see AUTHORS.
tests/_test_plugins/test_io_csv.py:11: :copyright: Copyright 2022-2022 Reimar Bauer
tests/_test_plugins/test_io_csv.py:12: :copyright: Copyright 2022-2022 by the MSS team, see AUTHORS.
tests/_test_plugins/test_io_flitestar.py:11: :copyright: Copyright 2022-2022 Reimar Bauer
tests/_test_plugins/test_io_flitestar.py:12: :copyright: Copyright 2022-2022 by the MSS team, see AUTHORS.
tests/_test_plugins/test_io_gpx.py:11: :copyright: Copyright 2022-2022 Reimar Bauer
tests/_test_plugins/test_io_gpx.py:12: :copyright: Copyright 2022-2022 by the MSS team, see AUTHORS.
tests/_test_plugins/test_io_kml.py:11: :copyright: Copyright 2022-2022 Reimar Bauer
tests/_test_plugins/test_io_kml.py:12: :copyright: Copyright 2022-2022 by the MSS team, see AUTHORS.
tests/_test_plugins/test_io_text.py:11: :copyright: Copyright 2022-2022 Reimar Bauer
tests/_test_plugins/test_io_text.py:12: :copyright: Copyright 2022-2022 by the MSS team, see AUTHORS.
tests/_test_utils/test_airdata.py:11: :copyright: Copyright 2022-2022 Reimar Bauer
tutorials/utils/__init__.py:13: :copyright: Copyright 2016-2023 by the MSS team, see AUTHORS.
tutorials/utils/constants.py:13: :copyright: Copyright 2016-2023 by the MSS team, see AUTHORS.
tutorials/utils/picture.py:11: :copyright: Copyright 2016-2023 by the MSS team, see AUTHORS.
tutorials/utils/platform_keys.py:10: :copyright: Copyright 2021-2023 by the MSS team, see AUTHORS.Is that intentional?
I'm going to repeat myself, but I dislike that these merge PRs conflate a bunch of different changes into one PR.
| @@ -87,4 +87,4 @@ jobs: | |||
| run: | | |||
| git config --global --add safe.directory /__w/MSS/MSS | |||
| mamba install -n ${{ env.mamba-env }} coveralls | |||
| mamba run --no-capture-output -n ${{ env.mamba-env }} coveralls --service=github | |||
| mamba run --no-capture-output -n ${{ env.mamba-env }} coveralls --service=github | |||
| @@ -138,7 +138,7 @@ def get_tutorial_images(): | |||
| # General information about the project. | |||
| project = 'MSS - Mission Support System' | |||
| copyright = \ | |||
| '2016-2023 by the MSS team, see AUTHORS, ' \ | |||
| '2016-2024 by the MSS team, see AUTHORS. ' \ | |||
There was a problem hiding this comment.
The strings are concatenated on a single line and separated by different characters now. This seems odd. Should they all be separated by a period?
There was a problem hiding this comment.
that should have been catched by the origin PR, that isn't correct.
| @@ -142,6 +142,6 @@ def retranslateUi(self, AboutMSUIDialog): | |||
| self.lblLicense.setText(_translate("AboutMSUIDialog", "License: Apache License Version 2.0")) | |||
| self.lblCopyright.setText(_translate("AboutMSUIDialog", "Copyright 2008-2014: Deutsches Zentrum fuer Luft- und Raumfahrt e.V.\n" | |||
| "Copyright 2011-2014: Marc Rautenhaus\n" | |||
| "Copyright 2016-2023: by the MSS team, see AUTHORS")) | |||
| "Copyright 2016-2024: by the MSS team, see AUTHORS")) | |||
| self.lblLinks.setText(_translate("AboutMSUIDialog", "<html><head/><body><p>See <a href=\"http://mss.rtfd.io\"><span style=\" text-decoration: underline; color:#0000ff;\">http://mss.rtfd.io</span></a> for detailed information and documentation.<br>Report bugs or feature requests at <a href=\"https://github.com/Open-MSS/MSS\"><span style=\" text-decoration: underline; color:#0000ff;\">https://github.com/Open-MSS/MSS</span></a>.</p></body></html>")) | |||
| self.btOK.setText(_translate("AboutMSUIDialog", "Ok")) | |||
| @@ -52,6 +52,13 @@ | |||
| zip_safe=False, | |||
| install_requires=[], # we use conda build recipe | |||
| entry_points=dict( | |||
| console_scripts=['msui = mslib.msui.msui:main'], | |||
| console_scripts=[ | |||
| "mscolab = mslib.mscolab.mscolab:main", | |||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| """ |
not really, #2276
We can add a rule, merge first before adding something new. |
Closed
|
Will fix first the missing parts in stable then we have to merge again. By that I look what was wrong in the conflicts resolved. Then you can do another round of review. But at all, we should have reviewed for missing strings and merged earlier. |
That would largely serialize PRs. Having information flow only happen in one direction (i.e. use backport PRs and never merge) would be easier and has less restrictions (e.g. no enforced order). Other than that, both would have the same effect. |
|
done differently |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose of PR?:
This needs a merge, without squashing