From a809192041868e16c6d03846c3841ae3a4c5f739 Mon Sep 17 00:00:00 2001 From: Marco Lehmann Date: Wed, 28 Mar 2018 18:19:23 +0200 Subject: [PATCH] removed PyPI support. Changed install doc accordingly --- Makefile | 13 +++++++------ doc/exercises/setup.rst | 33 +++------------------------------ 2 files changed, 10 insertions(+), 36 deletions(-) diff --git a/Makefile b/Makefile index 7e630d6..4bf697c 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ -deploy: test pypi conda +#deploy: test pypi conda +deploy: test conda # Documentation building @@ -6,12 +7,12 @@ sphinx: sphinx-apidoc -o doc/modules neurodynex -f make -C doc html -# Pypi deployment +# Pypi deployment (removed, march 2018) -pypi: - rm -rf dist/* - python setup.py bdist_wheel sdist - twine upload dist/* --config-file .pypirc +# pypi: +# rm -rf dist/* +# python setup.py bdist_wheel sdist +# twine upload dist/* --config-file .pypirc # Anaconda deployment diff --git a/doc/exercises/setup.rst b/doc/exercises/setup.rst index 6582c88..518e84e 100644 --- a/doc/exercises/setup.rst +++ b/doc/exercises/setup.rst @@ -9,10 +9,10 @@ To solve the exercises you need to install Python, Brian2 and the neurodynex pac .. _exercises-setup-conda: -Using miniconda (recommended) ------------------------------ +Using miniconda +--------------- -We offer anaconda packages for the most recent releases, which is the easiest way of running the exercises. +We offer anaconda packages for the most recent releases, which is the easiest way of running the exercises. (Alternatively you can clone the sources from github) Head over to the `miniconda download page `__ and install **miniconda** (for Python 2.7 preferably). @@ -65,33 +65,6 @@ We recommend you to create one notebook per exercise. >> conda install jupyter -Alternative procedure: Using python and pip -------------------------------------------- - -If you already have Python installed and prefer using PIP, you can get the most recent versions of this repository as a `pypi package `__ called ``neurodynex``. - -To install the exercises using ``pip`` simply execute (the ``--upgrade`` flag will overwrite existing installations with the newest versions): - -.. code-block:: bash - - pip install --upgrade jupyter - pip install --upgrade neurodynex - -.. note:: - - Should you want to run `Spyder `_ to work on the exercises, and you're running into problems (commonly, after running ``conda install spyder`` you can not start ``spyder`` due to an error related to numpy), try the following: - - .. code-block:: bash - - # create a new conda environment with spyder and the exercises - conda create --name neurodynex -c brian-team -c epfl-lcn neurodynex spyder - - # activate the environment - source activate neurodynex - - This creates a new conda environment (`here is more information on conda environments `_) in which you can use spyder together with the exercises. - - Links ----- Here are some useful links to get started with Python and Brian