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.

Sign up for GitHub

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

Drop support for Python 3.4 #709

Merged
merged 2 commits into from
Jun 11, 2019
Merged

Drop support for Python 3.4 #709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
244f298
Drop support for Python 3.4
danielmitterdorfer Jun 7, 2019
2a3e846
Leftover
danielmitterdorfer Jun 7, 2019
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
3 changes: 0 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,9 @@ PYENV_PREREQ_HELP = "\033[0;31mIMPORTANT\033[0m: please add \033[0;31meval \"\$$
VE_MISSING_HELP = "\033[0;31mIMPORTANT\033[0m: Couldn't find $(PWD)/$(VENV_NAME); have you executed make venv-create?\033[0m\n"

prereq: make-requirements.txt
# Temporarily disable Python 3.4 builds
# pyenv install --skip-existing $(PY34)
pyenv install --skip-existing $(PY35)
pyenv install --skip-existing $(PY36)
pyenv install --skip-existing $(PY37)
# pyenv global system $(PY34) $(PY35) $(PY36) $(PY37)
pyenv global system $(PY35) $(PY36) $(PY37)
-@ printf $(PYENV_PREREQ_HELP)

Expand Down
2 changes: 1 addition & 1 deletion README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Installing Rally

**Note**: If you actively develop on Elasticsearch, we recommend that you `install Rally in development mode <https://esrally.readthedocs.io/en/latest/developing.html#installation-instructions-for-development>`_ instead as Elasticsearch is fast moving and Rally always adapts accordingly to the latest master version.

Install Python 3.4+ including ``pip3``, git 1.9+ and an `appropriate JDK to run Elasticsearch <https://www.elastic.co/support/matrix#matrix_jvm>`_ Be sure that ``JAVA_HOME`` points to that JDK. Then run the following command, optionally prefixed by ``sudo`` if necessary::
Install Python 3.5+ including ``pip3``, git 1.9+ and an `appropriate JDK to run Elasticsearch <https://www.elastic.co/support/matrix#matrix_jvm>`_ Be sure that ``JAVA_HOME`` points to that JDK. Then run the following command, optionally prefixed by ``sudo`` if necessary::

pip3 install esrally

Expand Down
2 changes: 1 addition & 1 deletion docs/developing.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Prerequisites

Install the following software packages:

* Python 3.4 or better available as ``python3`` on the path (verify with: ``python3 --version``)
* Python 3.5 or better available as ``python3`` on the path (verify with: ``python3 --version``)
* ``pip3`` available on the path (verify with ``pip3 --version``)
* ``virtualenv`` available on the path (verify with ``virtualenv --version``)
* Pyenv installed and ``eval "$(pyenv init -)"`` is added to the shell configuration file. For more details please refer to the PyEnv `installation instructions <https://github.com/pyenv/pyenv#installation>`_.
Expand Down
29 changes: 3 additions & 26 deletions docs/install.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Rally does not support Windows and is only actively tested on MacOS and Linux. I
Python
~~~~~~

* Python 3.4 or better available as `python3` on the path. Verify with: ``python3 --version``.
* Python 3.5 or better available as `python3` on the path. Verify with: ``python3 --version``.
* Python3 header files (included in the Python3 development package).
* ``pip3`` available on the path. Verify with ``pip3 --version``.

Expand All @@ -27,32 +27,9 @@ Python
sudo apt-get install gcc python3-pip python3-dev


**RHEL 6/ CentOS 6**
**RHEL / CentOS 6 and 7**

*Tested on CentOS release 6.9 (Final).*

.. note::

You will need to enable `EPEL <https://fedoraproject.org/wiki/EPEL>`_ before.

::

sudo yum install -y gcc python34.x86_64 python34-devel.x86_64 python34-setuptools.noarch
# installs pip as it is not available as an OS package
sudo python3 /usr/lib/python3.4/site-packages/easy_install.py pip


**RHEL 7 / CentOS 7**

.. note::

You will need to enable `EPEL <https://fedoraproject.org/wiki/EPEL>`_ before.

*Tested on CentOS Linux release 7.4.1708 (Core).*

::

sudo yum install -y gcc python34.x86_64 python34-devel.x86_64 python34-pip.noarch
Please refer to the `installation instructions for Python 3.5 in the Red Hat Software Collections <https://www.softwarecollections.org/en/scls/rhscl/rh-python35/>`_.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense to recommend scl for the CentOS platforms.


**Amazon Linux**

Expand Down
2 changes: 1 addition & 1 deletion docs/quickstart.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Rally is developed for Unix and is actively tested on Linux and MacOS. Rally sup
Install
-------

Install Python 3.4+ including ``pip3``, git 1.9+ and an `appropriate JDK to run Elasticsearch <https://www.elastic.co/support/matrix#matrix_jvm>`_ Be sure that ``JAVA_HOME`` points to that JDK. Then run the following command, optionally prefixed by ``sudo`` if necessary::
Install Python 3.5+ including ``pip3``, git 1.9+ and an `appropriate JDK to run Elasticsearch <https://www.elastic.co/support/matrix#matrix_jvm>`_ Be sure that ``JAVA_HOME`` points to that JDK. Then run the following command, optionally prefixed by ``sudo`` if necessary::

pip3 install esrally

Expand Down
4 changes: 2 additions & 2 deletions esrally/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,5 @@


def check_python_version():
if sys.version_info.major != 3 or sys.version_info.minor < 4:
raise RuntimeError("Rally requires at least Python 3.4 but you are using:\n\nPython %s" % str(sys.version))
if sys.version_info.major != 3 or sys.version_info.minor < 5:
raise RuntimeError("Rally requires at least Python 3.5 but you are using:\n\nPython %s" % str(sys.version))
1 change: 0 additions & 1 deletion make-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
PY34=3.4.9
PY35=3.5.6
PY36=3.6.7
PY37=3.7.1
1 change: 0 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ def str_from_file(name):
"Operating System :: POSIX",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
Expand Down
8 changes: 2 additions & 6 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,20 @@
# ==============
#
# * Tox (pip3 install tox)
# * Python 3.4, 3.5, 3.6 and 3.7 available (pyenv: https://github.com/yyuu/pyenv)
# * Python 3.5, 3.6 and 3.7 available (pyenv: https://github.com/yyuu/pyenv)
#
# Hint: When using pyenv, new Python interpreters can be installed with:
#
# pyenv install 3.4.5
# pyenv install 3.5.2
# pyenv install 3.6.0
# pyenv install 3.7.0
#
# pyenv global system 3.7.0 3.6.0 3.5.2 3.4.5
# pyenv global system 3.7.0 3.6.0 3.5.2
#
# For details see https://github.com/yyuu/pyenv#choosing-the-python-version
#
###############################################################################
[tox]
# Temporarily disable Python 3.4 builds
#envlist =
# docs, py34, py35, py36, py37
envlist =
docs, py35, py36, py37
platform =
Expand Down