Commit b7553131 authored by lukas leufen's avatar lukas leufen

Merge branch 'release_v0.12.2' into 'master'

Resolve "new release v0.12.2"

Closes #184

See merge request !158
parents b0b449f1 45c3dc94
Pipeline #47928 passed with stages
in 13 minutes and 13 seconds
absl-py==0.9.0
astor==0.8.1
atomicwrites==1.3.0
attrs==19.3.0
certifi==2019.11.28
chardet==3.0.4
cloudpickle==1.3.0
coverage==5.0.3
cycler==0.10.0
Cython==0.29.15
dask==2.11.0
fsspec==0.6.2
gast==0.3.3
grpcio==1.27.2
h5py==2.10.0
idna==2.8
importlib-metadata==1.5.0
matplotlib==3.2.0 # in SciPy-Stack
netcdf4
pandas==1.0.1 # in SciPy-Stack
patsy==0.5.1 #
py==1.8.1 # ?
pyproj==2.5.0 # in basemap
pyshp==2.1.0 # in basemap
pytest==5.3.5 # in python (but we need higher version)
kiwisolver==1.1.0
locket==0.2.0
Markdown==3.2.1
matplotlib==3.2.0
mock==4.0.1
more-itertools==8.2.0
numpy==1.18.1
packaging==20.3
pandas==1.0.1
partd==1.1.0
patsy==0.5.1
Pillow==7.0.0
pluggy==0.13.1
protobuf==3.11.3
py==1.8.1
pydot==1.4.1
pyparsing==2.4.6
pyproj==2.5.0
pyshp==2.1.0
pytest==5.3.5
pytest-cov==2.8.1
pytest-html==2.0.1
pytest-lazy-fixture==0.6.3
pytest-metadata==1.8.0
pytest-sugar
statsmodels==0.11.1 # (in jupyter, bit not oh hdfml)
xarray==0.15.0 # in SciPy-Stacki (v0.12.1, only)
zipp==3.1.0
python-dateutil==2.8.1
pytz==2019.3
PyYAML==5.3
requests==2.23.0
scipy==1.4.1
seaborn==0.10.0
--no-binary shapely Shapely==1.7.0
six==1.11.0
statsmodels==0.11.1
tabulate
toolz==0.10.0
typing-extensions
urllib3==1.25.8
wcwidth==0.1.8
Werkzeug==1.0.0
xarray==0.15.0
zipp==3.1.0
......@@ -29,12 +29,12 @@ pip install --ignore-installed matplotlib==3.2.0
pip install --ignore-installed pandas==1.0.1
pip install --ignore-installed statsmodels==0.11.1
pip install --ignore-installed tabulate
pip install -U typing_extensions
# see wiki on hdfml for information oh h5py:
# https://gitlab.version.fz-juelich.de/haf/Wiki/-/wikis/HDF-ML%20System
export CC=mpicc
export HDF5_MPI="ON"
pip install --no-binary=h5py h5py
pip install --ignore-installed netcdf4==1.5.4
......@@ -26,7 +26,7 @@ install the geo packages. For special instructions to install MLAir on the Jueli
* Installation of **MLAir**:
* Either clone MLAir from the [gitlab repository](https://gitlab.version.fz-juelich.de/toar/mlair.git)
and use it without installation (beside the requirements)
* or download the distribution file ([current version](https://gitlab.version.fz-juelich.de/toar/mlair/-/blob/master/dist/mlair-0.12.1-py3-none-any.whl))
* or download the distribution file ([current version](https://gitlab.version.fz-juelich.de/toar/mlair/-/blob/master/dist/mlair-0.12.2-py3-none-any.whl))
and install it via `pip install <dist_file>.whl`. In this case, you can simply import MLAir in any python script
inside your virtual environment using `import mlair`.
......
# GUIDELINES
## release of new version
* Create Release Issue
* Create merge request: branch `release_vX.Y.Z` into `master`
* Merge `develop` into `release_vX.Y.Z`
* Checkout `release_vX.Y.Z`
* Adjust `changelog.md`
* Update version number in `mlair/__ init__.py`
* Create new dist file: `python3 setup.py sdist bdist_wheel`
* Update file link in `README.md`
* Update file link in `docs/_source/get-started.rst`
* Commit + push
* Merge `release_vX.Y.Z` into `master`
* Create new tag
......@@ -31,7 +31,8 @@ Installation of MLAir
* Install all requirements from `requirements.txt <https://gitlab.version.fz-juelich.de/toar/machinelearningtools/-/blob/master/requirements.txt>`_
preferably in a virtual environment
* Either clone MLAir from the `gitlab repository <https://gitlab.version.fz-juelich.de/toar/machinelearningtools.git>`_
* or download the distribution file (?? .whl) and install it via :py:`pip install <??>`. In this case, you can simply
* or download the distribution file (`current version <https://gitlab.version.fz-juelich.de/toar/mlair/-/blob/master/dist/mlair-0.12.2-py3-none-any.whl>`_)
and install it via :py:`pip install <dist_file>.whl`. In this case, you can simply
import MLAir in any python script inside your virtual environment using :py:`import mlair`.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment