Skip to content

Commit fca444a

Browse files
risehrMarilythReimarBauerJatin2020-24joernu76
authored
Syncing my GSOC branch with develop (#1066)
* Allow specification of file for linear defaultstyle (#1028) * Allow specification of file for default * Simplify if condition * Increase coverage (#1020) * Add wms_control tests * Add more mscolab tests * Add mpl_qtwidget coverage * Add mss_pyui coverage * Add transparency, noframe and xml checks * Add more wms tests * Test import with plugins * Add linearview tests * Add more multilayering tests * Revert to old testing.yml * Leave no dangling windows * Remove todo, move ConnectionError to bottom Co-authored-by: ReimarBauer <rb.proj@gmail.com> * Migrate existing thermodynamic functions to metpy functions (#1009) * removed functions from thermolib.py functions to be replaced by metpy were removed * fixed: flake8 * fixed: flake8 * migrated to metpy functions Co-Authored-By: J. Ungermann <28449201+joernu76@users.noreply.github.com> * Fixed: flake8 * Fixed: flake8 * Fixed tests * Fixed: flake8 * Fixed: failing tests * Ficed: tests * Units discarded upon returning results Co-Authored-By: J. Ungermann <28449201+joernu76@users.noreply.github.com> * `omega_to_w` migrated to metpy Co-authored-by: ReimarBauer <rb.proj@gmail.com> Co-authored-by: J. Ungermann <28449201+joernu76@users.noreply.github.com> * updated documentation (#1008) * updated documentation * improved install/update procedure Co-authored-by: Reimar Bauer <rb.proj@gmail.com> * Fixed: #999 (#1010) * .format replaced with f" string * updated copyright year * fixes #1014 (#1015) * Remove Qt imports (#1019) * Fixes #1014 changing http to https (#1017) Co-authored-by: ReimarBauer <rb.proj@gmail.com> * Linear view mscolab bug (#1021) * fixed tableview not opening bug; added test * added raising of mscolab window after closing view * preparation of v4.0.1 (#1023) * preparation of v4.0.1 * updated install instruction Co-authored-by: J. Ungermann <j.ungermann@fz-juelich.de> * Fix pyproj 3.1.0 error (#1033) * Minor bug fixes. (#1054) * Return proper unit for eq. potential temperature (degC->K) * Do not assume units of pressure levels for several old plotting styles. * Fix values of geopotential altitude in demodata * issue #719 solved (#729) * issue #719 solved * updated development.rst * updated development.rst Co-authored-by: ReimarBauer <rb.proj@gmail.com> * Select newest init-time and carry over multilayering (#1047) Co-authored-by: J. Ungermann <j.ungermann@fz-juelich.de> * Fix some issues with elevation caching and model level dimensions. (#1061) Fix #1066 * Added missing filename key. (#1062) See #1066 Co-authored-by: May <baermay98@gmail.com> Co-authored-by: ReimarBauer <rb.proj@gmail.com> Co-authored-by: Jatin Jain <72596619+Jatin2020-24@users.noreply.github.com> Co-authored-by: J. Ungermann <28449201+joernu76@users.noreply.github.com> Co-authored-by: open-mss-build <77272604+open-mss-build@users.noreply.github.com> Co-authored-by: Aryan Gupta <42470695+withoutwaxaryan@users.noreply.github.com> Co-authored-by: Aravind Murali <aravindmurali711@gmail.com> Co-authored-by: J. Ungermann <j.ungermann@fz-juelich.de> Co-authored-by: Archishman Sengupta <71402528+ArchishmanSengupta@users.noreply.github.com>
1 parent e516945 commit fca444a

49 files changed

Lines changed: 934 additions & 779 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

AUTHORS

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
Contributors
22
============
33

4+
in alphabetic order by first name
5+
46

57
- Andreas Hilboll <hilboll@uni-bremen.de>
68
- Anveshan Lal <anveshanrx8@gmail.com>
@@ -10,10 +12,10 @@ Contributors
1012
- Jens-Uwe Grooß <j.-u.grooss@fz-juelich.de>
1113
- Jörn Ungermann <j.ungermann@fz-juelich.de>
1214
- Marc Rautenhaus <wxmetvis@posteo.de>
15+
- May Bär <m.baer@fz-juelich.de>
1316
- Reimar Bauer <rb.proj@gmail.com>
1417
- Sakshi Chopkar <sakshichopkar@gmail.com>
1518
- Shivashis Padhi <shivashispadhi@gmail.com>
1619
- Tanish Grover <tanish1908@gmail.com>
1720
- Thomas Breuer <t.breuer@fz-juelich.de>
1821
- Vaibhav Mehra <veb7vmehra@gmail.com>
19-
- May Bär <m.baer@fz-juelich.de>

CHANGES.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
Changelog
22
=========
33

4+
Version 4.0.1
5+
~~~~~~~~~~~~~
6+
7+
Bug Fix release
8+
9+
All changes:
10+
https://github.com/Open-MSS/MSS/milestone/58?closed=1
11+
412
Version 4.0.0
513
-------------
614

conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def pytest_generate_tests(metafunc):
7878
This file is part of mss.
7979
8080
:copyright: Copyright 2019 Shivashis Padhi
81-
:copyright: Copyright 2019-2020 by the mss team, see AUTHORS.
81+
:copyright: Copyright 2019-2021 by the mss team, see AUTHORS.
8282
:license: APACHE-2.0, see LICENSE for details.
8383
8484
Licensed under the Apache License, Version 2.0 (the "License");

docs/development.rst

Lines changed: 118 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,97 @@
11
.. _development:
22

33

4+
1. System requirements
5+
6+
| Any system with basic configuration.
7+
| Operating System : Any (Windows / Linux / Mac).
8+
9+
2. Software requirement
10+
| Python
11+
| `Additional Requirements <https://github.com/Open-MSS/MSS/blob/develop/requirements.d/development.txt>`_
12+
13+
14+
3. Skill set
15+
| Knowledge of git & github
16+
| python
17+
18+
============================
19+
Setting Up local Environement
20+
============================
21+
22+
============================
23+
Forking the Repo
24+
============================
25+
1. Firstly you have to make your own copy of project. For that you have to fork the repository. You can find the fork button on the top-right side of the browser window.
26+
27+
2. Kindly wait till it gets forked.
28+
29+
3. After that copy will look like *<your-user-name>/MSS* forked from *Open-MSS/MSS*.
30+
31+
============================
32+
Cloning the Repo
33+
============================
34+
35+
1. Now you have your own copy of project. Here you have to start your work.
36+
37+
2. Go to desired location on your computer where you want to set-up the project.
38+
39+
3. Right click there and click on git bash. A terminal window will pop up
40+
41+
4. Click The big green button which says "Code". Copy the URL. `Like this <https://user-images.githubusercontent.com/71402528/122255281-9a855d80-ceeb-11eb-9f85-fed38db30562.png>`_
42+
43+
5. Now Type the command ``git clone <your-fork-url>.git`` and hit enter.
44+
45+
6. Wait for few seconds till the project gets copied
46+
47+
or simply head over here for `cloning a repository <https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/cloning-a-repository-from-github/cloning-a-repository>`_
48+
49+
============================
50+
Setting up remote :
51+
============================
52+
53+
1. Now you have to set up remote repositories
54+
55+
2. Type ``git remote -v`` in terminal to list remote connections to your repo.
56+
57+
3. It will show something like this:
58+
59+
``origin https://github.com/<your-user-name>/MSS.git`` (fetch)
60+
61+
``origin https://github.com/<your-user-name>/MSS.git`` (push)
62+
63+
4. Now type the command git remote add upstream ``https://github.com/Open-MSS/MSS.git`` this will set upstream as main directory
64+
65+
5. Again type in command git remote -v to check if remote has been set up correctly
66+
67+
6. It should show something like this :
68+
69+
``origin https://github.com/<your-user-name>/MSS.git`` (fetch)
70+
71+
``origin https://github.com/<your-user-name>/MSS.git`` (push)
72+
73+
upstream ``https://github.com/Open-MSS/MSS.git`` (fetch)
74+
75+
upstream ``https://github.com/Open-MSS/MSS.git`` (push)
76+
77+
78+
============================
79+
How to Report Bugs:
80+
============================
81+
Please open a new issue in the appropriate GitHub repository `here <https://github.com/Open-MSS/MSS/issues/new>`_ with steps to reproduce the problem you're experiencing.
82+
83+
Be sure to include as much information including screenshots, text output, and both your expected and actual results.
84+
85+
============================
86+
How to Request Enhancements:
87+
============================
88+
First, please refer to the applicable `GitHub repository <https://github.com/Open-MSS/MSS>`_ and search `the repository's GitHub issues <https://github.com/Open-MSS/MSS/issues>`_ to make sure your idea has not been (or is not still) considered.
89+
90+
Then, please `create a new issue <https://github.com/Open-MSS/MSS/issues/new>`_ in the GitHub repository describing your enhancement.
91+
92+
Be sure to include as much detail as possible including step-by-step descriptions, specific examples, screenshots or mockups, and reasoning for why the enhancement might be worthwhile.
93+
94+
============================
495
Development
596
============================
697

@@ -40,6 +131,7 @@ MSS repository needs a different folder, e.g. workspace/mss. Avoid to mix data a
40131

41132
MSS is based on the software of the conda-forge channel located, so we have to add this channel to the default::
42133

134+
43135
$ conda config --add channels conda-forge
44136

45137
Your content of the .condarc config file should have conda-forge on top::
@@ -53,7 +145,7 @@ Create an environment and install the whole mss package dependencies then remove
53145

54146
$ conda create -n mssdev mamba
55147
$ conda activate mssdev
56-
$ mamba install mss --only-deps
148+
$ mamba install mss=4.0.1 --only-deps
57149

58150
You can also use conda to install mss, but mamba is a way faster.
59151
Compare versions used in the meta.yaml between stable and develop branch and apply needed changes.
@@ -256,3 +348,28 @@ Publish on Conda Forge
256348
* send a pull request
257349
* maintainer will merge if there is no error
258350

351+
352+
============================
353+
Pushing your changes:
354+
============================
355+
356+
1. Now you have made the changes, tested them and built them. So now it's time to push them.
357+
2. Goto your terminal and type git status and hit enter, this will show your changes from the files
358+
3. Then type in git add and hit enter, this will add all the files to staging area
359+
4. Commit the changes by ``git commit -m "<message-describing-your-change>"`` and hit enter.
360+
5. Now push your branch to your fork by ``git push origin <your-branch-name>`` and hit enter.
361+
362+
363+
============================
364+
Creating a pull request:
365+
============================
366+
By this time you can see a message on your github fork as your fork is ahead of Open-MSS:develop by <number> of commits and also you can see a button called Compare and pull request.
367+
368+
Click on Compare and pull request button.
369+
370+
You will see a template.
371+
372+
Fill out the template completely by describing your change, cause of change, issue getting fixed etc.
373+
374+
After filling the template completely click on Pull request
375+

docs/help.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ MSCOLAB
99

1010
.. raw:: html
1111

12-
<iframe width="560" height="315" src=http://www.youtube.com/embed/eDBnULXvo7M?rel=0" frameborder="0" allowfullscreen></iframe>
12+
<iframe width="560" height="315" src="https://www.youtube.com/embed/eDBnULXvo7M?rel=0" frameborder="0" allowfullscreen></iframe>
1313

1414
KML Docking Widget
1515
------------------
1616

1717
.. raw:: html
1818

19-
<iframe width="560" height="315" src=http://www.youtube.com/embed/G4aPIRLBz9U?rel=0" frameborder="0" allowfullscreen></iframe>
19+
<iframe width="560" height="315" src="https://www.youtube.com/embed/G4aPIRLBz9U?rel=0" frameborder="0" allowfullscreen></iframe>
2020

docs/installation.rst

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ leave out the 'source' here and below). ::
5656

5757
$ conda create -n mssenv mamba
5858
$ conda activate mssenv
59-
(mssenv) $ mamba install mss
59+
(mssenv) $ mamba install mss=4.0.1 python
6060

6161

6262
You need to reactivate after the installation once the environment to setup all needed enironment
@@ -70,7 +70,9 @@ variables. ::
7070
update
7171
++++++
7272
For updating an existing MSS installation to the current version, it is best to install
73-
it into a new environment.
73+
it into a new environment. If your current version is not far behind the new version
74+
you could try the mamba update mss as described.
75+
7476

7577
.. Important::
7678
mamba is under development. All dependencies of MSS and MSS itselfs are under development.
@@ -79,35 +81,29 @@ it into a new environment.
7981
search for MSS what you can get ::
8082

8183
(mssenv) $ mamba search mss
82-
83-
mss 3.0.3 py39hf3d152e_0 conda-forge
84-
mss 3.0.3 py39hf3d152e_1 conda-forge
84+
...
85+
mss 4.0.1 py38h578d9bd_0 conda-forge
86+
mss 4.0.1 py39hf3d152e_0 conda-forge
8587

8688
compare what you have installed ::
8789

8890
(mssenv) $ mamba list mss
8991

9092
mss 3.0.2 py39hf3d152e_0 conda-forge
9193

92-
If an existing environment shall be updated, it is important to update all packages in this environment. ::
9394

94-
$ conda activate mssenv
95-
(mssenv) $ mamba update --all
95+
We have reports that often an update suceeds by using the install option and the new version number,
96+
in this example 4.0.1 and python as second option ::
97+
98+
(mssenv) $ mamba install mss=4.0.1 python
9699

97-
In this example there was a further build done after the first release of 3.0.3.
98-
Compare in the list of proposed updates what you would get ::
100+
All attemmpts show what you get if you continue. **Continue only if you get what you want.**
99101

100-
matplotlib 3.4.2 py39hf3d152e_0 conda-forge
101-
matplotlib-base 3.4.2 py39h2fa2bec_0 conda-forge
102-
mss 3.0.3 py39hf3d152e_0 conda-forge
103-
multidict 5.1.0 py39h3811e60_1 conda-forge
102+
The alternative is to use a new environment and install mss.
104103

105-
If you see a mismatch like this, not getting the recent buildnumber. In this example value in
106-
third column ends with "_1" you have to force the update by the conda command::
107104

108-
(mssenv) $ conda install mss==3.0.3=py39hf3d152e_1
109105

110-
For further details :ref:`mss-configuration`
106+
For further details of configurating mss :ref:`mss-configuration`
111107

112108

113109

@@ -127,7 +123,7 @@ We suggest to create a mss user.
127123
* login again or export PATH="/home/mss/miniconda3/bin:$PATH"
128124
* conda create -n mssenv mamba
129125
* conda activate mssenv
130-
* mamba install mss
126+
* mamba install mss=4.0.1 python
131127

132128
For a simple test you could start the builtin standalone *mswms* and *mscolab* server::
133129

docs/mscolab.rst

Lines changed: 31 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -121,39 +121,48 @@ You can turn the `Work Locally` toggle off at any points and work on the common
121121

122122
Notes for server administrators
123123
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
124-
If you're configuring mscolab server, there isn't a GUI to add or manage a group of users. There is however a
125-
proposal to bring this on around the next release of mss. For now, there is a command line tool available with the
126-
installation of mss, :code:`mscolab_add_permissions`. It's usage is as follows
124+
If you're configuring mscolab server, there is a manage users GUI to add or manage users to a project.
125+
There is a command line tool available with the installation of mss, :code:`mscolab`. It can import users to the database
126+
and can handle joins to projects.
127127

128-
- Make a text file with the following format
128+
Make a text file with the following format to import many users to the mscolab database
129129

130130
.. code-block:: text
131131
132-
path1
133-
u1-c
134-
u2-c
135-
u3-a
132+
suggested_username name <email>
133+
suggested_username2 name2 <email2>
136134
137-
path2
138-
u1-a
135+
.. code-block:: text
139136
140-
path3
141-
u2-v
137+
$ mscolab db --users_by_file /path/to/file
142138
143-
- `path1` represents the path of project in mscolab db.
144-
- u1, u2, u3 are usernames.
145-
- `c` stands for collaborator, `a` for admin, `v` for viewer.
146-
- Different paths are separated by 2 '\n's.
147-
- The tool can be invocated anywhere by a command, where :code:`/path/to/file` represents the path to file created above.
139+
After executed you get informations to exchange with users.
148140

149141
.. code-block:: text
150142
151-
$ mscolab_add_permissions /path/to/file
143+
Are you sure you want to add users to the database? (y/[n]):
144+
y
145+
Userdata: email suggested_username 30736d0350c9b886
146+
147+
"MSCOLAB_mailid": "email",
148+
"MSCOLAB_password": "30736d0350c9b886",
149+
150+
151+
Userdata: email2 suggested_username2 342434de34904303
152+
153+
"MSCOLAB_mailid": "email2",
154+
"MSCOLAB_password": "342434de34904303",
152155
153-
instructions to use mscolab wsgi
156+
Further options can be listed by `mscolab db -h`
157+
158+
159+
Instructions to use mscolab wsgi
154160
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
155161

156162
make a file called :code:`server.py`
163+
and install ::
164+
165+
mamba install eventlet==0.30.2 gunicorn
157166

158167
**server.py**::
159168

@@ -163,3 +172,6 @@ Then run the following commands. ::
163172

164173
$ mamba install gunicorn eventlet
165174
$ gunicorn -b 0.0.0.0:8087 server:app
175+
176+
177+
For further options read `<https://flask.palletsprojects.com/en/1.1.x/deploying/wsgi-standalone/#gunicorn>`_

docs/samples/config/mscolab/mscolab_settings.py.sample

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
This file is part of mss.
1010

1111
:copyright: Copyright 2019 Shivashis Padhi
12+
:copyright: Copyright 2019-2021 by the mss team, see AUTHORS.
1213
:license: APACHE-2.0, see LICENSE for details.
1314

1415
Licensed under the Apache License, Version 2.0 (the "License");

0 commit comments

Comments
 (0)