Skip to content
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
10 changes: 4 additions & 6 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,9 @@ Installing

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

easy_install -U pymodbus
pip install -U pymodbus
pip install -U pymodbus

This will install a base version of pymodbus.

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


Or to install a specific release::
Or to install a specific release:

pip install -U pymodbus==X.Y.Z
easy_install -U pymodbus==X.Y.Z
pip install -U pymodbus==X.Y.Z

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

Expand Down
12 changes: 5 additions & 7 deletions doc/INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,16 @@ The Windows IOCP reactor requires pywin32 build 205 or later.
Installation
-------------

To install the package from pypi, use either easy_install or pip::
To install the package from pypi, use pip:

pip install -U pymodbus
easy_install -U pymodbus
pip install -U pymodbus

Or to install a specific release::
Or to install a specific release:

pip install -U pymodbus==X.Y.Z
easy_install -U pymodbus==X.Y.Z
pip install -U pymodbus==X.Y.Z

As with other Python packages, the standard way of installing from source
is (as root or administrator)::
is (as root or administrator):

https://github.com/riptideio/pymodbus.git
git checkout master
Expand Down
266 changes: 0 additions & 266 deletions ez_setup.py

This file was deleted.

7 changes: 1 addition & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,7 @@
# --------------------------------------------------------------------------- #
# initialization
# --------------------------------------------------------------------------- #
try: # if not installed, install and proceed
from setuptools import find_packages, setup
except ImportError:
from ez_setup import use_setuptools
use_setuptools()
from setuptools import find_packages, setup
from setuptools import find_packages, setup
try:
from setup_commands import command_classes
except ImportError:
Expand Down