nuke setuptools and "make install"
This code didn't work. If we ever want setup.py back we can get it from version
control.
diff --git a/README b/README
index fff7c8a..0c8ba3d 100644
--- a/README
+++ b/README
@@ -53,8 +53,8 @@
Quick Start
+++++++++++
- You need to have Python setup tools and Scapy installed on your
- system. See 'Pre-requisites' below.
+ You need to have Python and Scapy installed on your system.
+ See 'Pre-requisites' below.
Make sure your switch is running and trying to connect to a
controller on the machine where you're running oft (normally port
@@ -65,7 +65,7 @@
# git clone git://github.com/floodlight/oftest
# cd oftest
- # make -C tools/munger install
+ # make -C tools/munger
Make sure the switch you want to test is running --
see (4) below for the reference switch example.
# ./oft --list
@@ -83,7 +83,6 @@
to a controller on the machine running oft.
* Python 2.5 or 2.6. You can run platforms using eth interfaces
with Python 2.4. Python 2.7 may work.
- * Python setup tools (e.g.: sudo apt-get install python-setuptools)
* oftest checked out (called <oftest> here)
* scapy installed: http://www.secdev.org/projects/scapy/
'sudo apt-get install scapy' should work on Debian.
@@ -98,11 +97,9 @@
the file in <oftest>/tools/pylibopenflow/include/openflow.h
This is currently the 1.0 release file.
- cd <oftest>/tools/munger
- make install
+ make -C <oftest>/tools/munger
- This places files in <oftest>/src/python/oftest/src and then
- calls setuptools to install on the local host
+ This places files in <oftest>/src/python/oftest/src.
3. Edit configuration if necessary
Local platforms work with veth interface pairs and default to
@@ -148,21 +145,6 @@
cd <oftest>
sudo ./oft --help
-Helpful Note: Rebuilding
-++++++++++++++++++++++++
-
- If you ever make a change to the code in src/oftest/python...
- you must rebuild and reinstall the source code. See Step (2)
- in the Longer Start above.
-
- If you see
-
- WARNING:..:Could not import file ...
-
- There is likely a Python error in the file. Try invoking the
- Python cli directly and importing the file to get more
- information.
-
Helpful Note: Recovering From Crash
+++++++++++++++++++++++++++++++++++
@@ -257,9 +239,9 @@
Important Notes
+++++++++++++++
- 1. If you edit any of the files in src/python/oftest or any of the
- scripts in tools/munger/scripts, you MUST re-run make install. This
- is easy to forget.
+ 1. If you change any of the code generation scripts in
+ tools/munger/scripts you must re-run make -C tools/munger to
+ regenerate the OpenFlow message classes.
2. If your running into issues with transactions, and it appears that
OpenFlow messages aren't quite right, start by looking at any length
diff --git a/src/python/setup.py b/src/python/setup.py
deleted file mode 100644
index b5a462d..0000000
--- a/src/python/setup.py
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env python
-'''Setuptools params'''
-
-from setuptools import setup, find_packages
-
-modname = distname = 'oftest'
-
-setup(
- name='oftest',
- version='0.0.1',
- description='An OpenFlow Testing Framework',
- author='Dan Talayco/Tatsuya Yabe',
- author_email='dtalayco@stanford.edu',
- packages=find_packages(),
- long_description="""\
-OpenFlow test framework package.
- """,
- classifiers=[
- "License :: OSI Approved :: GNU General Public License (GPL)",
- "Programming Language :: Python",
- "Development Status :: 4 - Beta",
- "Intended Audience :: Developers",
- "Topic :: Internet",
- ],
- keywords='networking protocol Internet OpenFlow validation',
- license='unspecified',
- install_requires=[
- 'setuptools',
- 'doxypy',
- 'pylint'
- ])
diff --git a/tools/munger/Makefile b/tools/munger/Makefile
index 31f3423..dc5bf1c 100644
--- a/tools/munger/Makefile
+++ b/tools/munger/Makefile
@@ -12,7 +12,6 @@
PYLIBOF_DIR = ${TOOLS_DIR}/pylibopenflow
TARGET_DIR = ${TOP_DIR}/src/python/oftest
-SETUP_DIR = ${TOP_DIR}/src/python/
# Relative to pyopenflow-pythonize exec location
OF_HEADER = include/openflow.h
@@ -41,9 +40,6 @@
all: ${GEN_FILES}
-install: all
- (cd ${SETUP_DIR} && sudo python setup.py install)
-
# The core OpenFlow libraries generated from openflow.h
${TARGET_DIR}/cstruct.py: ${CSTRUCT_DEP}
${CSTRUCT_GEN_CMD} > ${CSTRUCT_AUX_INFO}
@@ -83,7 +79,6 @@
@echo " all: Puts generated .py in ${TARGET_DIR}"
@echo " lint: Puts error report in lint/*.log"
@echo " doc: Runs doxygen on generated files in ../../doc"
- @echo " install: Run setup tools for generated python source"
@echo " clean: Removes generated files"
@echo
@echo "Debug info:"