Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docs cleanup #316

Merged
merged 7 commits into from
Sep 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,21 +102,10 @@ When you use this eFEL software for your research, we ask you to cite the follow
}
```

News
====

* 2023/01/04: We dropped support for Python 3.6. The eFEL code isn't automatically tested on 3.6 anymore.

* 2021/08/25: We dropped support for Python 2.7. The eFEL code isn't automatically tested on 2.7 anymore.

* 2016/01/17: We dropped support for Python 2.6. We're following the numpy and coverage module who also dropped support recently.
For the moment eFEL still works with Python 2.6, you will just have to install the right (older) versions of the dependencies.
The eFEL code isn't automatically tested on 2.6 anymore.

Requirements
============

* [Python 3.7+](https://www.python.org/download/releases/3.4.3/)
* [Python 3.8+](https://www.python.org/downloads/)
* [Pip](https://pip.pypa.io) (installed by default in newer versions of Python)
* C++ compiler that can be used by pip
* [Numpy](http://www.numpy.org) (will be installed automatically by pip)
Expand Down
6 changes: 3 additions & 3 deletions docs/source/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Installation

Requirements
------------
* `Python 3.4+ <https://www.python.org/download/releases/3.4.3/>`_
* `Python <https://www.python.org/downloads/>`_
* `Pip <https://pip.pypa.io>`_ (installed by default in newer versions of Python)
* `Numpy <http://www.numpy.org>`_ (will be installed automatically by pip)
* The instruction below are written assuming you have access to a command shell on Linux / UNIX / MacOSX / Cygwin
Expand All @@ -13,12 +13,12 @@ Installation using pip

The easiest way to install eFEL is to use `pip <https://pip.pypa.io>`_::

pip install git+git://github.com/BlueBrain/eFEL
pip install efel

In case you don't have administrator access this command might fail with a
permission error. In that case you could install eFEL in your home directory::

pip install --user git+git://github.com/BlueBrain/eFEL
pip install efel --user

Or you could use a `python virtual environment <https://virtualenv.pypa.io>`_::

Expand Down
4 changes: 2 additions & 2 deletions docs/source/python_example1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ The code and example trace are available
for trace_results in traces_results:
# trace_result is a dictionary, with as keys the requested eFeatures
for feature_name, feature_values in trace_results.items():
print "Feature %s has the following values: %s" % \
(feature_name, ', '.join([str(x) for x in feature_values]))
print("Feature %s has the following values: %s" % \
(feature_name, ', '.join([str(x) for x in feature_values])))


if __name__ == '__main__':
Expand Down
3 changes: 0 additions & 3 deletions efel/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@
along with this library; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
"""

from __future__ import division

# pylint: disable=W0602,W0603,W0702, F0401, W0612, R0912

import os
Expand Down
1 change: 0 additions & 1 deletion examples/basic/basic_example1.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from __future__ import print_function
"""Basic example 1 for eFEL"""

import os
Expand Down
2 changes: 0 additions & 2 deletions tests/update_expectedresults.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

"""Test all features on an example trace"""

from __future__ import print_function

"""
Copyright (c) 2015, Blue Brain Project/EPFL

Expand Down
2 changes: 0 additions & 2 deletions tests/update_featurenames.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

"""Update the featurenames json file that contains the expected names"""

from __future__ import print_function

"""
Copyright (c) 2015, Blue Brain Project/EPFL

Expand Down
Loading