Merge branch 'no-src-directory' into test

jeremyBanks · Apr 29, 2014 · c16ae79 · c16ae79
2 parents ced5d07 + 6afc255
commit c16ae79
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -1,12 +1,15 @@
 default: test run-example
 
 run-example: install-dependencies
-	PYTHONPATH="src/:$(PYTHONPATH)" python examples/example.py
+	python examples/example.py
 
 test: install-dependencies
-	PYTHONPATH="src/:$(PYTHONPATH)" python -m pytest
+	python -m pytest
 
 install-dependencies:
+	# This also creates a link to `chatexchange/` in the Python
+	# environment, which is neccessary for the other files to be
+	# able to find it.
 	rm -rf src/*.egg-info
 	pip install -e .
 

diff --git a/src/__init__.py → chatexchange/__init__.py b/src/__init__.py → chatexchange/__init__.py
diff --git a/src/chatexchange/asyncwrapper.py → chatexchange/asyncwrapper.py b/src/chatexchange/asyncwrapper.py → chatexchange/asyncwrapper.py
diff --git a/src/chatexchange/browser.py → chatexchange/browser.py b/src/chatexchange/browser.py → chatexchange/browser.py
diff --git a/src/chatexchange/wrapper.py → chatexchange/wrapper.py b/src/chatexchange/wrapper.py → chatexchange/wrapper.py
diff --git a/setup.py b/setup.py
@@ -3,14 +3,11 @@
 
 setuptools.setup(
     name='ChatExchange',
-    version='0.0.0dev6',
+    version='0.0.0dev7',
     url='https://github.com/Manishearth/ChatExchange',
     packages=[
         'chatexchange'
     ],
-    package_dir={
-        '': 'src'
-    },
     install_requires=[
         'BeautifulSoup==3.2.1',
         'httmock==1.2.2',

diff --git a/src/chatexchange/__init__.py b/src/chatexchange/__init__.py