Move betamax into the src directory

Let's be sure that we're testing the package and not the local copy when we run our tests.
betamaxpy · Mar 13, 2018 · cf6aefe · cf6aefe
1 parent e5bbd11
commit cf6aefe
Show file tree

Hide file tree

Showing 31 changed files with 30 additions and 22 deletions.
diff --git a/setup.py b/setup.py
@@ -1,34 +1,41 @@
+"""Packaging logic for betamax."""
 import os
 import re
 import sys
-from setuptools import setup, find_packages
 
-packages = find_packages(exclude=['tests', 'tests.integration'])
-requires = ['requests >= 2.0']
+import setuptools
 
-__version__ = ''
-with open('betamax/__init__.py', 'r') as fd:
-    reg = re.compile(r'__version__ = [\'"]([^\'"]*)[\'"]')
+packages = setuptools.find_packages(
+    "src",
+    exclude=["tests", "tests.integration"],
+)
+requires = ["requests >= 2.0"]
+
+__version__ = ""
+with open("src/betamax/__init__.py", "r") as fd:
+    reg = re.compile(r"__version__ = [\'']([^\'']*)[\'']")
     for line in fd:
         m = reg.match(line)
         if m:
             __version__ = m.group(1)
             break
 
 if not __version__:
-    raise RuntimeError('Cannot find version information')
+    raise RuntimeError("Cannot find version information")
 
-if sys.argv[-1] in ['submit', 'publish']:
+if sys.argv[-1] in ["submit", "publish"]:
     os.system("python setup.py sdist bdist_wheel upload")
     sys.exit()
 
 
 def data_for(filename):
+    """Read the file data for a filename."""
     with open(filename) as fd:
         content = fd.read()
     return content
 
-setup(
+
+setuptools.setup(
     name="betamax",
     version=__version__,
     description="A VCR imitation for python-requests",
@@ -39,23 +46,24 @@ def data_for(filename):
     author_email="graffatcolmingov@gmail.com",
     url="https://github.com/sigmavirus24/betamax",
     packages=packages,
-    package_data={'': ['LICENSE', 'AUTHORS.rst']},
+    package_dir={"": "src"},
+    package_data={"": ["LICENSE", "AUTHORS.rst"]},
     include_package_data=True,
     install_requires=requires,
     entry_points={
-        'pytest11': ['pytest-betamax = betamax.fixtures.pytest']
+        "pytest11": ["pytest-betamax = betamax.fixtures.pytest"]
     },
     classifiers=[
-        'Development Status :: 4 - Beta',
-        'License :: OSI Approved',
-        'Intended Audience :: Developers',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: Implementation :: CPython',
+        "Development Status :: 5 - Production/Stable",
+        "License :: OSI Approved",
+        "Intended Audience :: Developers",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 2",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.3",
+        "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: Implementation :: CPython",
     ]
 )
diff --git a/betamax/__init__.py → src/betamax/__init__.py b/betamax/__init__.py → src/betamax/__init__.py
diff --git a/betamax/adapter.py → src/betamax/adapter.py b/betamax/adapter.py → src/betamax/adapter.py
diff --git a/betamax/cassette/__init__.py → src/betamax/cassette/__init__.py b/betamax/cassette/__init__.py → src/betamax/cassette/__init__.py
diff --git a/betamax/cassette/cassette.py → src/betamax/cassette/cassette.py b/betamax/cassette/cassette.py → src/betamax/cassette/cassette.py
diff --git a/betamax/cassette/interaction.py → src/betamax/cassette/interaction.py b/betamax/cassette/interaction.py → src/betamax/cassette/interaction.py
diff --git a/betamax/configure.py → src/betamax/configure.py b/betamax/configure.py → src/betamax/configure.py
diff --git a/betamax/decorator.py → src/betamax/decorator.py b/betamax/decorator.py → src/betamax/decorator.py
diff --git a/betamax/exceptions.py → src/betamax/exceptions.py b/betamax/exceptions.py → src/betamax/exceptions.py
diff --git a/betamax/fixtures/__init__.py → src/betamax/fixtures/__init__.py b/betamax/fixtures/__init__.py → src/betamax/fixtures/__init__.py
diff --git a/betamax/fixtures/pytest.py → src/betamax/fixtures/pytest.py b/betamax/fixtures/pytest.py → src/betamax/fixtures/pytest.py
diff --git a/betamax/fixtures/unittest.py → src/betamax/fixtures/unittest.py b/betamax/fixtures/unittest.py → src/betamax/fixtures/unittest.py
diff --git a/betamax/headers.py → src/betamax/headers.py b/betamax/headers.py → src/betamax/headers.py
diff --git a/betamax/matchers/__init__.py → src/betamax/matchers/__init__.py b/betamax/matchers/__init__.py → src/betamax/matchers/__init__.py
diff --git a/betamax/matchers/base.py → src/betamax/matchers/base.py b/betamax/matchers/base.py → src/betamax/matchers/base.py
diff --git a/betamax/matchers/body.py → src/betamax/matchers/body.py b/betamax/matchers/body.py → src/betamax/matchers/body.py
diff --git a/betamax/matchers/digest_auth.py → src/betamax/matchers/digest_auth.py b/betamax/matchers/digest_auth.py → src/betamax/matchers/digest_auth.py
diff --git a/betamax/matchers/headers.py → src/betamax/matchers/headers.py b/betamax/matchers/headers.py → src/betamax/matchers/headers.py
diff --git a/betamax/matchers/host.py → src/betamax/matchers/host.py b/betamax/matchers/host.py → src/betamax/matchers/host.py
diff --git a/betamax/matchers/method.py → src/betamax/matchers/method.py b/betamax/matchers/method.py → src/betamax/matchers/method.py
diff --git a/betamax/matchers/path.py → src/betamax/matchers/path.py b/betamax/matchers/path.py → src/betamax/matchers/path.py
diff --git a/betamax/matchers/query.py → src/betamax/matchers/query.py b/betamax/matchers/query.py → src/betamax/matchers/query.py
diff --git a/betamax/matchers/uri.py → src/betamax/matchers/uri.py b/betamax/matchers/uri.py → src/betamax/matchers/uri.py
diff --git a/betamax/mock_response.py → src/betamax/mock_response.py b/betamax/mock_response.py → src/betamax/mock_response.py
diff --git a/betamax/options.py → src/betamax/options.py b/betamax/options.py → src/betamax/options.py
diff --git a/betamax/recorder.py → src/betamax/recorder.py b/betamax/recorder.py → src/betamax/recorder.py
diff --git a/betamax/serializers/__init__.py → src/betamax/serializers/__init__.py b/betamax/serializers/__init__.py → src/betamax/serializers/__init__.py
diff --git a/betamax/serializers/base.py → src/betamax/serializers/base.py b/betamax/serializers/base.py → src/betamax/serializers/base.py
diff --git a/betamax/serializers/json_serializer.py → src/betamax/serializers/json_serializer.py b/betamax/serializers/json_serializer.py → src/betamax/serializers/json_serializer.py
diff --git a/betamax/serializers/proxy.py → src/betamax/serializers/proxy.py b/betamax/serializers/proxy.py → src/betamax/serializers/proxy.py
diff --git a/betamax/util.py → src/betamax/util.py b/betamax/util.py → src/betamax/util.py