From 851eeab46ba9fa81cc67b4aaf0b0fdd7db0e5543 Mon Sep 17 00:00:00 2001 From: PennyHow Date: Sat, 11 May 2024 14:56:25 -0100 Subject: [PATCH] main branch updates --- CONTRIBUTING.rst | 2 +- README.md | 2 +- pyDataverse/docs/source/index.rst | 8 ++++++++ pyDataverse/docs/source/user/installation.rst | 11 +++++++++++ 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 697eac4..6af019e 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -863,7 +863,7 @@ related to release activities), the release can be created. This includes: - update version number - merge ``develop`` to ``master`` - tag release name to commit (e. g. ``v0.3.0``), push branch and create pull request -- upload to `PyPI `_ +- upload to `PyPI `_ and `conda-forge `_ You can find the full release history at :ref:`community_history` and on `GitHub `_. diff --git a/README.md b/README.md index db7c9dc..099c308 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![PyPI](https://img.shields.io/pypi/v/pyDataverse.svg)](https://pypi.org/project/pyDataverse/) ![Build Status](https://github.com/gdcc/pyDataverse/actions/workflows/test_build.yml/badge.svg) [![Coverage Status](https://coveralls.io/repos/github/gdcc/pyDataverse/badge.svg)](https://coveralls.io/github/gdcc/pyDataverse) [![Documentation Status](https://readthedocs.org/projects/pydataverse/badge/?version=latest)](https://pydataverse.readthedocs.io/en/latest) PyPI - Python Version [![GitHub](https://img.shields.io/github/license/gdcc/pydataverse.svg)](https://opensource.org/licenses/MIT) [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4664557.svg)](https://doi.org/10.5281/zenodo.4664557) +[![PyPI](https://img.shields.io/pypi/v/pyDataverse.svg)](https://pypi.org/project/pyDataverse/) [![Conda Version](https://img.shields.io/conda/vn/conda-forge/pydataverse.svg)](https://anaconda.org/conda-forge/pydataverse/) ![Build Status](https://github.com/gdcc/pyDataverse/actions/workflows/test_build.yml/badge.svg) [![Coverage Status](https://coveralls.io/repos/github/gdcc/pyDataverse/badge.svg)](https://coveralls.io/github/gdcc/pyDataverse) [![Documentation Status](https://readthedocs.org/projects/pydataverse/badge/?version=latest)](https://pydataverse.readthedocs.io/en/latest) PyPI - Python Version [![GitHub](https://img.shields.io/github/license/gdcc/pydataverse.svg)](https://opensource.org/licenses/MIT) [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4664557.svg)](https://doi.org/10.5281/zenodo.4664557) # pyDataverse diff --git a/pyDataverse/docs/source/index.rst b/pyDataverse/docs/source/index.rst index 8252b81..f31e2e3 100644 --- a/pyDataverse/docs/source/index.rst +++ b/pyDataverse/docs/source/index.rst @@ -8,6 +8,9 @@ Release v\ |version|. .. image:: https://img.shields.io/github/v/release/gdcc/pyDataverse :target: https://github.com/gdcc/pyDataverse +.. image:: https://img.shields.io/conda/vn/conda-forge/pydataverse.svg + :target: https://anaconda.org/conda-forge/pydataverse + .. image:: https://travis-ci.com/gdcc/pyDataverse.svg?branch=master :target: https://travis-ci.com/gdcc/pyDataverse @@ -68,6 +71,11 @@ To install pyDataverse, simply run this command in your terminal of choice: pip install pyDataverse +Or run this command to install using conda: + +.. code-block:: shell + + conda install pyDataverse -c conda-forge Find more options at :ref:`user_installation`. diff --git a/pyDataverse/docs/source/user/installation.rst b/pyDataverse/docs/source/user/installation.rst index 766604c..af7a174 100644 --- a/pyDataverse/docs/source/user/installation.rst +++ b/pyDataverse/docs/source/user/installation.rst @@ -48,6 +48,17 @@ Pipenv .. _user_installation_source-code: + +Conda +----------------------------- + +pyDataverse is also available through `conda-forge `_. + +.. code-block:: shell + + conda install pyDataverse -c conda-forge + + Source Code -----------------------------