Skip to content

Commit 1f6a280

Browse files
committed
Add conda-forge installation instructions
1 parent 171f125 commit 1f6a280

File tree

4 files changed

+61
-28
lines changed

4 files changed

+61
-28
lines changed

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/checkout@v3
1414
with:
1515
fetch-depth: 0
16-
16+
1717
- name: Publish with flit
1818
env:
1919
FLIT_USERNAME: ${{ secrets.pypi_username }}

README.rst

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11

2-
.. image:: https://badge.fury.io/py/viresclient.svg
3-
:target: https://badge.fury.io/py/viresclient
2+
.. image:: https://img.shields.io/pypi/v/viresclient
3+
:target: https://pypi.org/project/viresclient/
4+
:alt: PyPI
5+
6+
.. image:: https://img.shields.io/conda/vn/conda-forge/viresclient
7+
:target: https://anaconda.org/conda-forge/viresclient
8+
:alt: Conda
49

510
.. image:: https://readthedocs.org/projects/viresclient/badge/?version=latest
611
:target: http://viresclient.readthedocs.io/
@@ -13,6 +18,10 @@
1318

1419
pip install viresclient
1520

21+
::
22+
23+
conda install -c conda-forge viresclient
24+
1625
viresclient_ is a Python package which connects to a VirES server, of which there are two: *VirES for Swarm* (https://vires.services) and *VirES for Aeolus* (https://aeolus.services), through the WPS_ interface. This package handles product requests and downloads, enabling easy access to data and models from ESA's Earth Explorer missions, Swarm_ and Aeolus_. This service is provided for ESA by EOX_. For enquiries about the service and problems with accessing your account, please email [email protected]. For help with usage, please email [email protected] (for Swarm data) or `raise an issue on GitHub`_.
1726

1827
.. _viresclient: https://github.com/ESA-VirES/VirES-Python-Client

docs/installation.rst

Lines changed: 42 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,50 +6,67 @@ Installation and First Usage
66
1. Installation
77
---------------
88

9-
Python ≥ 3.6 is required. Testing is primarily on Linux, but macOS and Windows should also work.
9+
Python ≥ 3.6 is required. Testing is primarily on Linux, but macOS and Windows should also work. Available through both pip and conda (conda-forge).
1010

11-
It can currently be installed with::
11+
.. tabs::
12+
13+
.. group-tab:: pip
14+
15+
.. code-block:: sh
16+
17+
pip install viresclient
1218
13-
pip install viresclient
19+
.. group-tab:: conda
1420

15-
Dependencies::
21+
.. code-block:: sh
1622
17-
requests
18-
Jinja2
19-
tables
20-
tqdm
21-
cdflib
22-
pandas
23-
xarray
24-
netCDF4
23+
conda install --channel conda-forge viresclient
2524
26-
pip will fetch these automatically - if you are using conda, it may be better to install these first using conda instead (where available)::
25+
.. group-tab:: mamba
2726

28-
conda install requests jinja2 pytables tqdm pandas xarray netcdf4
29-
pip install viresclient
27+
.. code-block:: sh
28+
29+
mamba install --channel conda-forge viresclient
3030
3131
Recommended setup if starting without Python already
3232
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3333

34-
1. Install Miniconda: https://docs.conda.io/en/latest/miniconda.html
34+
There are many ways to work with Python. We recommend using conda/mamba to manage your programming environment because of the availability of many data science packages through conda.
35+
36+
.. tabs::
37+
38+
.. group-tab:: conda
39+
40+
1. Install Miniconda: https://docs.conda.io/en/latest/miniconda.html
41+
42+
2. Set the conda-forge channel as the priority to install packages from::
43+
44+
conda config --add channels conda-forge
45+
conda config --set channel_priority strict
46+
47+
You should do this to avoid mixing packages from the anaconda channel (which can result in broken environments), and try to get all packages from conda-forge where available for consistency.
48+
49+
3. Create a new conda environment with some recommended packages, including viresclient::
50+
51+
conda create --name myenv python=3.10 jupyterlab scipy matplotlib pandas xarray cartopy h5py netCDF4 pytables ipywidgets viresclient
3552

36-
2. Set the conda-forge channel as the priority to install packages from::
53+
4. Activate the new environment (you do this each time you want to use it)::
3754

38-
conda config --add channels conda-forge
39-
conda config --set channel_priority strict
55+
conda activate myenv
4056

41-
3. Create a new conda environment with some recommended packages::
57+
.. group-tab:: mamba
4258

43-
conda create --name myenv scipy matplotlib pandas xarray cartopy jupyter jupyterlab flake8 dask h5py netCDF4 jinja2 pytables tqdm ipywidgets
59+
`Mamba <https://mamba.readthedocs.io/>`_ is a drop-in replacement for conda. You can install it into an existing (base) conda environment (``conda install -c conda-forge mamba``) and then just use ``mamba`` in place of ``conda`` in any commands - mamba is significantly faster. You can also install *mambaforge* directly to get mamba and conda-forge immediately configured in the base environment.
4460

45-
Activate the new environment (you do this each time you want to use it)::
61+
1. Download and install the `mambaforge installer <https://github.com/conda-forge/miniforge#mambaforge>`_ or check the `mamba documentation <https://mamba.readthedocs.io/en/latest/installation.html>`_
4662

47-
conda activate myenv
63+
2. Create a new environment for your development work::
4864

49-
4. Use pip to install viresclient::
65+
mamba create --name myenv python=3.10 jupyterlab scipy matplotlib pandas xarray cartopy h5py netCDF4 pytables ipywidgets viresclient
5066

51-
pip install viresclient
67+
3. Activate it to use it::
5268

69+
mamba activate myenv
5370

5471

5572
2. First usage / Configuration

docs/release_notes.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ Release notes
44
Change log
55
----------
66

7+
Changes from 0.11.0 to 0.11.1
8+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
9+
10+
- ``viresclient`` package now available through conda-forge
11+
- Added parameter to Swarm ``MAG`` collections: ``dF_Sun``
12+
- Added GOCE ML magnetic dataset: ``GO_MAG_ACAL_CORR_ML``
13+
714
Changes from 0.10.3 to 0.11.0
815
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
916

0 commit comments

Comments
 (0)