From 820b61abc9ec25eb2edda5563b21e93d7311d07a Mon Sep 17 00:00:00 2001 From: Anil Tuncel Date: Thu, 21 Sep 2023 18:11:03 +0200 Subject: [PATCH 1/5] update installation.rst --- docs/source/installation.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/installation.rst b/docs/source/installation.rst index 568dd88e..dc3196d3 100644 --- a/docs/source/installation.rst +++ b/docs/source/installation.rst @@ -3,7 +3,7 @@ Installation Requirements ------------ -* `Python 3.4+ `_ +* `Python `_ * `Pip `_ (installed by default in newer versions of Python) * `Numpy `_ (will be installed automatically by pip) * The instruction below are written assuming you have access to a command shell on Linux / UNIX / MacOSX / Cygwin @@ -13,12 +13,12 @@ Installation using pip The easiest way to install eFEL is to use `pip `_:: - 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 `_:: From 788ca683181cce44a4348391ed4cbfe639eb99f8 Mon Sep 17 00:00:00 2001 From: Anil Tuncel Date: Thu, 21 Sep 2023 18:12:13 +0200 Subject: [PATCH 2/5] Update README: remove we dropped py2.6 in 2016 parts --- README.md | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/README.md b/README.md index 53df28ea..427674fd 100644 --- a/README.md +++ b/README.md @@ -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) From f8e31418d9081746b76ac12dea425673d8fdbd9b Mon Sep 17 00:00:00 2001 From: Anil Tuncel Date: Thu, 21 Sep 2023 18:15:02 +0200 Subject: [PATCH 3/5] add print function in python_example1.rst --- docs/source/python_example1.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/python_example1.rst b/docs/source/python_example1.rst index d59c6b8b..70598a9c 100644 --- a/docs/source/python_example1.rst +++ b/docs/source/python_example1.rst @@ -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__': From 976eccae0eeb7f5b98fb80302a9cbf8336298567 Mon Sep 17 00:00:00 2001 From: Anil Tuncel Date: Thu, 21 Sep 2023 18:17:25 +0200 Subject: [PATCH 4/5] remove from future import division PEP 238 --- efel/api.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/efel/api.py b/efel/api.py index f0410001..43621ffa 100644 --- a/efel/api.py +++ b/efel/api.py @@ -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 From 91d2c8b01260ad8e3e7586f8ea02d1353924ba1e Mon Sep 17 00:00:00 2001 From: Anil Tuncel Date: Thu, 21 Sep 2023 18:18:02 +0200 Subject: [PATCH 5/5] remove from __future__ import print_function --- examples/basic/basic_example1.py | 1 - tests/update_expectedresults.py | 2 -- tests/update_featurenames.py | 2 -- 3 files changed, 5 deletions(-) diff --git a/examples/basic/basic_example1.py b/examples/basic/basic_example1.py index b818ab90..37cab7f6 100644 --- a/examples/basic/basic_example1.py +++ b/examples/basic/basic_example1.py @@ -1,4 +1,3 @@ -from __future__ import print_function """Basic example 1 for eFEL""" import os diff --git a/tests/update_expectedresults.py b/tests/update_expectedresults.py index 7b64d80e..7adf9e52 100755 --- a/tests/update_expectedresults.py +++ b/tests/update_expectedresults.py @@ -2,8 +2,6 @@ """Test all features on an example trace""" -from __future__ import print_function - """ Copyright (c) 2015, Blue Brain Project/EPFL diff --git a/tests/update_featurenames.py b/tests/update_featurenames.py index 7ac4f192..46cb9514 100755 --- a/tests/update_featurenames.py +++ b/tests/update_featurenames.py @@ -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