Skip to content

Commit

Permalink
removed PyPI support. Changed install doc accordingly
Browse files Browse the repository at this point in the history
  • Loading branch information
MarcoLehmann committed Mar 28, 2018
1 parent b0a8a53 commit a809192
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 36 deletions.
13 changes: 7 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
deploy: test pypi conda
#deploy: test pypi conda
deploy: test conda

# Documentation building

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

Expand Down
33 changes: 3 additions & 30 deletions doc/exercises/setup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <http://conda.pydata.org/miniconda.html>`__ and install **miniconda** (for Python 2.7 preferably).

Expand Down Expand Up @@ -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 <https://pypi.python.org/pypi/neurodynex/>`__ 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 <https://github.com/spyder-ide/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 <http://conda.pydata.org/docs/test-drive.html#managing-envs>`_) in which you can use spyder together with the exercises.


Links
-----
Here are some useful links to get started with Python and Brian
Expand Down

0 comments on commit a809192

Please sign in to comment.