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

Merge develop to stable == 9.0.0 #2384

Merged
merged 203 commits into from
May 22, 2024
Merged

Merge develop to stable == 9.0.0 #2384

merged 203 commits into from
May 22, 2024

Conversation

ReimarBauer
Copy link
Member

Purpose of PR?:

this is the base of the next stable release 9.x

388 files changed, 13933 insertions(+), 8041 deletions(-)

There was no merge conflict.

Removed the pyvirtualdisplay section from testing.yml

This needs a merge.

ReimarBauer and others added 30 commits April 27, 2023 18:18
* Tests added for remote sensing widget

* Fixed flake8

* Flake8 fixed

* Updated authors

* AUTHORS updated

* Fixed pytest errors

* Issues resolved

* Import order updated

* Changes made

* Update test_remotesensing.py

* Data reorganized

* Update test_remotesensing.py
* added stuff

* keyring tidy up

* fixed some testcases

* fixed keyring

* added method to 'clear' keyring

* split connect tests and added a '401' one for authorization denied case

* adapted to comments

* adapted to comments

* renamed http_auth to mss_auth

* removed misplaced http_basic_auth statment

* updated keyring related documentation

* updated status messages.

* update

* update
* fill mswms_settings with default values.

* update
* preparing migration of json data to next major

* flake8

* further changes

* type fixed

* new test for new migration

* sample files updated

* test improved

* syntax fixe in sample
* individual imports

better lookup by IDEs

removed globals

* flake8
* update super() calls to modern python
* removed class ...(object)
* enable tests for GSOC branches

* added a new testing action based on develop for gsoc

* undo blank

* var changed

* name changed

* removed unexpected value
* Make colorbar ticks format in generics plot configurable

Fix #1828

* make vsec consistent with hsec

* fix

* fix
* introduction of group management

* comment updated
ReimarBauer and others added 20 commits May 13, 2024 18:29
moved the menuinst to the conda-build process
When possible tests should use the actual application code instead of
inventing their own.
This fixes warnings about sub-directories of mslib/ that were previously
not part of the packages because they don't contain __init__.py, but
that were still recognized and added as packages due to a deprecated
behavior of setuptools.

The change from exclude to include is due to the excludes not being
exhaustive. Multiple consecutive builds would add the entirety of build/
into the package with the excludes. Since we know that mslib and its
sub-packages are the only ones that should be distributed we can just be
explicit about that.
Bumps [benc-uk/workflow-dispatch](https://github.com/benc-uk/workflow-dispatch) from 1.2.2 to 1.2.3.
- [Release notes](https://github.com/benc-uk/workflow-dispatch/releases)
- [Commits](benc-uk/workflow-dispatch@v1.2.2...v1.2.3)

---
updated-dependencies:
- dependency-name: benc-uk/workflow-dispatch
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Dependabot apparently does not support YAML aliases in its configuration
file.
* Fix osfs:/ directory leftover in CWD after tests

* Fix leftover directories in /tmp after tests

The way wms_cache was set previously made it so that after each tests
run there would be one or more directories leftover in /tmp. This also
happened for each start of MSUI. This change makes MSUI use the
platform-specific cache directory of the user instead and sets
XDG_CACHE_HOME to isolate those between test runs.
prepared tutorials for release,  
updated videos in mp4 format, 
introduced Alt text
changed loglevel of matplotlib

---------

Co-authored-by: ReimarBauer <[email protected]>
@ReimarBauer ReimarBauer requested review from matrss and joernu76 May 22, 2024 04:37
@ReimarBauer
Copy link
Member Author

ReimarBauer commented May 22, 2024

git diff develop

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index b6e7d33c..0e1f739f 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -31,13 +31,6 @@ jobs:
       run: cmp -s /meta.yaml localbuild/meta.yaml && cmp -s /development.txt requirements.d/development.txt ||
         (echo Dependencies differ && echo "triggerdockerbuild=yes" >> $GITHUB_ENV )
 
-    - name: Install pyvirtualdisplay if on stable
-      if: ${{ inputs.image_suffix == 'stable' }}
-      run: |
-        source /opt/conda/etc/profile.d/conda.sh
-        source /opt/conda/etc/profile.d/mamba.sh
-        mamba install -n mss-${{ inputs.image_suffix }}-env pyvirtualdisplay
-
     - name: Always rebuild dependencies for scheduled builds (started from testing-scheduled.yml)
       if: ${{ github.event_name == 'workflow_dispatch' }}
       run: echo "triggerdockerbuild=yes" >> $GITHUB_ENV

@ReimarBauer
Copy link
Member Author

@matrss I wonder why we don't see a coverage.

@matrss
Copy link
Collaborator

matrss commented May 22, 2024

@matrss I wonder why we don't see a coverage.

Coveralls shows it as "pending completion", no idea why. See: https://coveralls.io/builds/67629652

@ReimarBauer
Copy link
Member Author

@matrss I wonder why we don't see a coverage.

Coveralls shows it as "pending completion", no idea why. See: https://coveralls.io/builds/67629652

Then we ignore it that time, perhaps it had a network hickup.

Copy link
Collaborator

@matrss matrss left a comment

Choose a reason for hiding this comment

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

Same as develop modulo the pyvirtualdisplay step, and CI passes. So, LGTM.

@ReimarBauer ReimarBauer merged commit 3858525 into stable May 22, 2024
9 checks passed
@ReimarBauer ReimarBauer deleted the merge_develop_to_stable branch May 22, 2024 06:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.