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

pull from open mss #1

Merged
merged 17 commits into from
Mar 6, 2021
Merged

pull from open mss #1

merged 17 commits into from
Mar 6, 2021

Conversation

risehr
Copy link
Owner

@risehr risehr commented Mar 6, 2021

pull from open-mss

Marilyth and others added 17 commits February 4, 2021 21:37
* Editing mscolab Url must be blocked on connect #637 (#661)

* mscolab disconnect #637

* Removed set editable #637

* Fix conda-forge missing in channels

Co-authored-by: Aheli Ghosh <debjanihome@gmail.com>
Co-authored-by: joernu76 <j.ungermann@fz-juelich.de>
Co-authored-by: ReimarBauer <rb.proj@gmail.com>
…oader (#663)

* new opional parameter for pytest --mss_settings

by this parameter tests can use a mss_settings.json
saved in the test tmp directory
example:
pytest -k test_existing_empty_config_file --mss_settings '{"num_interpolation_points": 201 }'

* tests for user defined mss_settings.json added

* further testcases and a first fix

* moved testsetup for mss_settings.json inside the tests

* test fixed, utils fixed

* removed default option of config_loader

* config_file reading seperated from logic

* improved test and config_loader

* improved comments for default config
Co-authored-by: ReimarBauer <rb.proj@gmail.com>
Replaced pep8 by flake8.
* Make MSS work with 1.3.0

* Add namespace to capabilities

* Get version without scraping

* Add 1.3.0 Service Exception

* Default server to 1.1.1, remove unrelated changes

* Don't hardcode WMS Client version

* Refactor ogcwms to latest owslib code

* Make more conform

* Support authentication for 1.1.1

* Redetermine version after authentication

* Remove deprecated method, explain removeXMLNamespace

* Default to 1.1.1 not 1.3.0

* Handle dynamic version directly in ogcwms

Co-authored-by: ReimarBauer <rb.proj@gmail.com>
Co-authored-by: ReimarBauer <rb.proj@gmail.com>
* Create CODE_OF_CONDUCT.md

* Update CODE_OF_CONDUCT.md

* Update CODE_OF_CONDUCT.md

Co-authored-by: joernu76 <j.ungermann@fz-juelich.de>
Co-authored-by: ReimarBauer <rb.proj@gmail.com>
* .format replaced with f''

* .format replaced with f''

* .format replaced with f'' (#652)

* Stable to develop (#667)

* Editing mscolab Url must be blocked on connect #637 (#661)

* mscolab disconnect #637

* Removed set editable #637

* Fix conda-forge missing in channels

Co-authored-by: Aheli Ghosh <debjanihome@gmail.com>

* Create CONTRIBUTING.md (#645)

Co-authored-by: joernu76 <j.ungermann@fz-juelich.de>
Co-authored-by: ReimarBauer <rb.proj@gmail.com>

* new optional parameter for pytest --mss_settings / improving config_loader (#663)

* new opional parameter for pytest --mss_settings

by this parameter tests can use a mss_settings.json
saved in the test tmp directory
example:
pytest -k test_existing_empty_config_file --mss_settings '{"num_interpolation_points": 201 }'

* tests for user defined mss_settings.json added

* further testcases and a first fix

* moved testsetup for mss_settings.json inside the tests

* test fixed, utils fixed

* removed default option of config_loader

* config_file reading seperated from logic

* improved test and config_loader

* improved comments for default config

* resolving a merge conflict

* Update CHANGES.rst

* Update CHANGES.rst

* Update testing.yml

* Update wms_control.py

* Update test_wms.py

* resolving a merge conflict

* resolving a merge conflict

* resolving merge conflict

* resolving merge conflict

Co-authored-by: ReimarBauer <rb.proj@gmail.com>
Co-authored-by: May <baermay98@gmail.com>
Co-authored-by: Aheli Ghosh <debjanihome@gmail.com>
Co-authored-by: Bobin Mathew <bobinm3@gmail.com>
Co-authored-by: joernu76 <j.ungermann@fz-juelich.de>
…ts (#679)

* Add testing to stable

* Added fix for #642 (#647)

* Added fix for #642

* Fixed import os to fs #642

* Removed comment

* Changed exists statement #642

* Fixed pylint error #642

* Editing mscolab Url must be blocked on connect #637 (#661)

* mscolab disconnect #637

* Removed set editable #637

* Fix conda-forge missing in channels (#666)

* added fixation for geos to <3.9.0, fixes #665 (#668)

* improved independency of tests

* missing assertion readded

* further hardcoded ports removed

* removed some test dependencies

* use always different ports

* ordered, added pytest-xdist

* action for pytest-xdist possible tests

* job name updated

* space from jobname removed

* removed blank lines

* updated action for a change in development.txt

Co-authored-by: May <baermay98@gmail.com>
Co-authored-by: Aheli Ghosh <debjanihome@gmail.com>
Co-authored-by: ReimarBauer <rb.proj@gmail.com>
…#684)

* Add testing to stable

* Added fix for #642 (#647)

* Added fix for #642

* Fixed import os to fs #642

* Removed comment

* Changed exists statement #642

* Fixed pylint error #642

* Editing mscolab Url must be blocked on connect #637 (#661)

* mscolab disconnect #637

* Removed set editable #637

* Fix conda-forge missing in channels (#666)

* added fixation for geos to <3.9.0, fixes #665 (#668)

* fixes config_loader for local mss_settings, #683

Co-authored-by: May <baermay98@gmail.com>
Co-authored-by: Aheli Ghosh <debjanihome@gmail.com>
Issue #685

Changed link to docker site to updated link.

I am new to github, this is the first time I am editing a file directly on the github website, not 100% sure if this will create a pull request the same way, so apologies if this is not what is required.

Co-authored-by: ReimarBauer <rb.proj@gmail.com>
* flake8 fix

* removed not needed name
…es (#696)

Some past changes removing the title box within vertical section layers
left over some dead code w.r.t. to title. Removed the dead code and
moved the information from the (non-existing) title to the abstract
field.

Fix issue #694

Co-authored-by: ReimarBauer <rb.proj@gmail.com>
@risehr risehr merged commit b83211a into risehr:develop Mar 6, 2021
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.

8 participants