Skip to content

Commit 3942d79

Browse files
imba-tjdjaniversen
andauthored
remove easy_install and ez_setup (#964)
remove easy_install and ez_setup Co-authored-by: jan iversen <jancasacondor@gmail.com>
1 parent a30fdc4 commit 3942d79

File tree

4 files changed

+10
-285
lines changed

4 files changed

+10
-285
lines changed

README.rst

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,9 @@ Installing
149149

150150
You can install using pip or easy install by issuing the following
151151
commands in a terminal window (make sure you have correct
152-
permissions or a virtualenv currently running)::
152+
permissions or a virtualenv currently running):
153153

154-
easy_install -U pymodbus
155-
pip install -U pymodbus
154+
pip install -U pymodbus
156155

157156
This will install a base version of pymodbus.
158157

@@ -175,10 +174,9 @@ Available options are:
175174
- **development**, installs development tools needed to enable test/check of pymodbus changes.
176175

177176

178-
Or to install a specific release::
177+
Or to install a specific release:
179178

180-
pip install -U pymodbus==X.Y.Z
181-
easy_install -U pymodbus==X.Y.Z
179+
pip install -U pymodbus==X.Y.Z
182180

183181
Otherwise you can pull the trunk source and install from there::
184182

doc/INSTALL

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,16 @@ The Windows IOCP reactor requires pywin32 build 205 or later.
1818
Installation
1919
-------------
2020

21-
To install the package from pypi, use either easy_install or pip::
21+
To install the package from pypi, use pip:
2222

23-
pip install -U pymodbus
24-
easy_install -U pymodbus
23+
pip install -U pymodbus
2524

26-
Or to install a specific release::
25+
Or to install a specific release:
2726

28-
pip install -U pymodbus==X.Y.Z
29-
easy_install -U pymodbus==X.Y.Z
27+
pip install -U pymodbus==X.Y.Z
3028

3129
As with other Python packages, the standard way of installing from source
32-
is (as root or administrator)::
30+
is (as root or administrator):
3331

3432
https://github.com/riptideio/pymodbus.git
3533
git checkout master

ez_setup.py

Lines changed: 0 additions & 266 deletions
This file was deleted.

setup.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,7 @@
55
# --------------------------------------------------------------------------- #
66
# initialization
77
# --------------------------------------------------------------------------- #
8-
try: # if not installed, install and proceed
9-
from setuptools import find_packages, setup
10-
except ImportError:
11-
from ez_setup import use_setuptools
12-
use_setuptools()
13-
from setuptools import find_packages, setup
8+
from setuptools import find_packages, setup
149
try:
1510
from setup_commands import command_classes
1611
except ImportError:

0 commit comments

Comments
 (0)