Reorganize source tree.

doc -> docs, put relstorage into a src/ directory to avoid issues having the working directory on the path. Fixes #218
zodb · May 10, 2019 · d33fb33 · d33fb33
1 parent 970444d
commit d33fb33
Show file tree

Hide file tree

Showing 163 changed files with 54 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,6 @@ include/
 lib/
 parts/
 
-doc/_build/
-doc/__pycache__
-doc/relstorage.*.rst
+docs/_build/
+docs/__pycache__
+docs/relstorage.*.rst
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -0,0 +1,26 @@
+# .readthedocs.yml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Some things can only be configured on the RTD dashboard.
+# Those that we may have changed from the default include:
+
+# Show Version Warning: False
+
+# Required
+version: 2
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  builder: html
+  configuration: docs/conf.py
+
+# Set the version of Python and requirements required to build your
+# docs
+python:
+  version: 3
+  install:
+    - method: pip
+      path: .
+      extra_requirements:
+        - docs
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,4 +1,4 @@
-include MANIFEST.in *.txt *.py setup.cfg
+include MANIFEST.in *.txt *.py *.yml setup.cfg
 include .coveragerc
 include buildout*.cfg
 include tox.ini
@@ -9,12 +9,10 @@ include CHANGES.rst
 include .landscape.yml
 recursive-include .travis *
 
-recursive-include notes *.ods *.py *.sql *.txt
+recursive-include src *.py *.xml *.txt *.test *.conf *.rst *.c *.h
 
-recursive-include relstorage *.py *.xml *.txt *.test *.conf *.rst *.c *.h
-
-recursive-include doc *.py *.rst *.png Makefile
-recursive-exclude doc relstorage.*.rst _build
+recursive-include docs *.py *.rst *.png Makefile
+recursive-exclude docs relstorage.*.rst _build
 
 recursive-include repltest *.cfg *.conf *.in *.patch *.sql
 recursive-include scripts *.sh make-manylinux
diff --git a/doc/.mocks/_pylibmc.py → docs/.mocks/_pylibmc.py b/doc/.mocks/_pylibmc.py → docs/.mocks/_pylibmc.py
diff --git a/doc/.mocks/cx_Oracle.py → docs/.mocks/cx_Oracle.py b/doc/.mocks/cx_Oracle.py → docs/.mocks/cx_Oracle.py
diff --git a/doc/.mocks/pylibmc.py → docs/.mocks/pylibmc.py b/doc/.mocks/pylibmc.py → docs/.mocks/pylibmc.py
diff --git a/doc/Makefile → docs/Makefile b/doc/Makefile → docs/Makefile
diff --git a/doc/cache-tracing.rst → docs/cache-tracing.rst b/doc/cache-tracing.rst → docs/cache-tracing.rst
diff --git a/doc/changelog.rst → docs/changelog.rst b/doc/changelog.rst → docs/changelog.rst
diff --git a/doc/conf.py → docs/conf.py b/doc/conf.py → docs/conf.py
@@ -36,7 +36,7 @@
 
 
 try:
-    import pylibmc
+    __import__('pylibmc')
 except ImportError:
     print("Mocking pylibmc for docs")
     sys.path.append(".mocks")
@@ -268,21 +268,21 @@
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {
-     # The paper size ('letterpaper' or 'a4paper').
-     #
-     # 'papersize': 'letterpaper',
+    # The paper size ('letterpaper' or 'a4paper').
+    #
+    # 'papersize': 'letterpaper',
 
-     # The font size ('10pt', '11pt' or '12pt').
-     #
-     # 'pointsize': '10pt',
+    # The font size ('10pt', '11pt' or '12pt').
+    #
+    # 'pointsize': '10pt',
 
-     # Additional stuff for the LaTeX preamble.
-     #
-     # 'preamble': '',
+    # Additional stuff for the LaTeX preamble.
+    #
+    # 'preamble': '',
 
-     # Latex figure (float) alignment
-     #
-     # 'figure_align': 'htbp',
+    # Latex figure (float) alignment
+    #
+    # 'figure_align': 'htbp',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples

diff --git a/doc/configure-application.rst → docs/configure-application.rst b/doc/configure-application.rst → docs/configure-application.rst
diff --git a/doc/configure-database.rst → docs/configure-database.rst b/doc/configure-database.rst → docs/configure-database.rst
diff --git a/doc/contents.rst → docs/contents.rst b/doc/contents.rst → docs/contents.rst
diff --git a/doc/db-specific-options.rst → docs/db-specific-options.rst b/doc/db-specific-options.rst → docs/db-specific-options.rst
diff --git a/doc/developing.rst → docs/developing.rst b/doc/developing.rst → docs/developing.rst
diff --git a/doc/developing/caching.rst → docs/developing/caching.rst b/doc/developing/caching.rst → docs/developing/caching.rst
diff --git a/doc/developing/pack_policy.png → docs/developing/pack_policy.png b/doc/developing/pack_policy.png → docs/developing/pack_policy.png
diff --git a/doc/developing/packing.rst → docs/developing/packing.rst b/doc/developing/packing.rst → docs/developing/packing.rst
diff --git a/doc/developing/running.rst → docs/developing/running.rst b/doc/developing/running.rst → docs/developing/running.rst
diff --git a/doc/faq.rst → docs/faq.rst b/doc/faq.rst → docs/faq.rst
diff --git a/doc/generate_rst.py → docs/generate_rst.py b/doc/generate_rst.py → docs/generate_rst.py
diff --git a/doc/index.rst → docs/index.rst b/doc/index.rst → docs/index.rst
diff --git a/doc/install.rst → docs/install.rst b/doc/install.rst → docs/install.rst
diff --git a/doc/migration.rst → docs/migration.rst b/doc/migration.rst → docs/migration.rst
diff --git a/doc/migration/migrate-to-1.0.rst → docs/migration/migrate-to-1.0.rst b/doc/migration/migrate-to-1.0.rst → docs/migration/migrate-to-1.0.rst
diff --git a/doc/migration/migrate-to-1.1.1.rst → docs/migration/migrate-to-1.1.1.rst b/doc/migration/migrate-to-1.1.1.rst → docs/migration/migrate-to-1.1.1.rst
diff --git a/doc/migration/migrate-to-1.1.2.rst → docs/migration/migrate-to-1.1.2.rst b/doc/migration/migrate-to-1.1.2.rst → docs/migration/migrate-to-1.1.2.rst
diff --git a/doc/migration/migrate-to-1.1.rst → docs/migration/migrate-to-1.1.rst b/doc/migration/migrate-to-1.1.rst → docs/migration/migrate-to-1.1.rst
diff --git a/doc/migration/migrate-to-1.4.rst → docs/migration/migrate-to-1.4.rst b/doc/migration/migrate-to-1.4.rst → docs/migration/migrate-to-1.4.rst
diff --git a/doc/migration/migrate-to-1.5.rst → docs/migration/migrate-to-1.5.rst b/doc/migration/migrate-to-1.5.rst → docs/migration/migrate-to-1.5.rst
diff --git a/doc/old_history.rst → docs/old_history.rst b/doc/old_history.rst → docs/old_history.rst
diff --git a/doc/perf-20.png → docs/perf-20.png b/doc/perf-20.png → docs/perf-20.png
diff --git a/doc/perf-rs14.png → docs/perf-rs14.png b/doc/perf-rs14.png → docs/perf-rs14.png
diff --git a/doc/perf-rs20-no-mem.png → docs/perf-rs20-no-mem.png b/doc/perf-rs20-no-mem.png → docs/perf-rs20-no-mem.png
diff --git a/doc/perf-rs20-rs16.png → docs/perf-rs20-rs16.png b/doc/perf-rs20-rs16.png → docs/perf-rs20-rs16.png
diff --git a/doc/perf-rs20pypy.png → docs/perf-rs20pypy.png b/doc/perf-rs20pypy.png → docs/perf-rs20pypy.png
diff --git a/doc/perf-rs21v20-c2.png → docs/perf-rs21v20-c2.png b/doc/perf-rs21v20-c2.png → docs/perf-rs21v20-c2.png
diff --git a/doc/perf-rs21v20-c6-n100-s256.png → docs/perf-rs21v20-c6-n100-s256.png b/doc/perf-rs21v20-c6-n100-s256.png → docs/perf-rs21v20-c6-n100-s256.png
diff --git a/doc/performance.rst → docs/performance.rst b/doc/performance.rst → docs/performance.rst
diff --git a/doc/relstorage-options.rst → docs/relstorage-options.rst b/doc/relstorage-options.rst → docs/relstorage-options.rst
diff --git a/doc/zodbconvert.rst → docs/zodbconvert.rst b/doc/zodbconvert.rst → docs/zodbconvert.rst
diff --git a/doc/zodbpack.rst → docs/zodbpack.rst b/doc/zodbpack.rst → docs/zodbpack.rst
diff --git a/doc/zodburi.rst → docs/zodburi.rst b/doc/zodburi.rst → docs/zodburi.rst
diff --git a/setup.py b/setup.py
@@ -54,7 +54,8 @@ def read_file(*path):
         'Documentation': 'http://relstorage.readthedocs.io',
     },
     keywords="ZODB SQL RDBMS MySQL PostgreSQL Oracle",
-    packages=find_packages(),
+    packages=find_packages('src'),
+    package_dir={'': 'src'},
     include_package_data=True,
     license="ZPL 2.1",
     platforms=["any"],
@@ -99,7 +100,7 @@ def read_file(*path):
     # Otherwise, we'll build it at import time. The wheels we distribute should have
     # cffi installed so we distribute the built binaries.
     cffi_modules=[
-        'relstorage/cache/_cache_ring_build.py:ffi',
+        'src/relstorage/cache/_cache_ring_build.py:ffi',
     ],
     tests_require=tests_require,
     extras_require={
@@ -136,6 +137,11 @@ def read_file(*path):
             'cx_Oracle>=5.0.0'
         ],
         'test': tests_require,
+        'docs': [
+            'sphinxcontrib-programoutput',
+            'repoze.sphinx.autointerface',
+            'sphinx_rtd_theme',
+        ],
     },
     entry_points={
         'console_scripts': [

diff --git a/relstorage/__init__.py → src/relstorage/__init__.py b/relstorage/__init__.py → src/relstorage/__init__.py
diff --git a/relstorage/_compat.py → src/relstorage/_compat.py b/relstorage/_compat.py → src/relstorage/_compat.py
diff --git a/relstorage/adapters/__init__.py → src/relstorage/adapters/__init__.py b/relstorage/adapters/__init__.py → src/relstorage/adapters/__init__.py
diff --git a/relstorage/adapters/_abstract_drivers.py → src/relstorage/adapters/_abstract_drivers.py b/relstorage/adapters/_abstract_drivers.py → src/relstorage/adapters/_abstract_drivers.py
diff --git a/relstorage/adapters/_util.py → src/relstorage/adapters/_util.py b/relstorage/adapters/_util.py → src/relstorage/adapters/_util.py
diff --git a/relstorage/adapters/batch.py → src/relstorage/adapters/batch.py b/relstorage/adapters/batch.py → src/relstorage/adapters/batch.py
diff --git a/relstorage/adapters/connmanager.py → src/relstorage/adapters/connmanager.py b/relstorage/adapters/connmanager.py → src/relstorage/adapters/connmanager.py
diff --git a/relstorage/adapters/dbiter.py → src/relstorage/adapters/dbiter.py b/relstorage/adapters/dbiter.py → src/relstorage/adapters/dbiter.py
diff --git a/relstorage/adapters/interfaces.py → src/relstorage/adapters/interfaces.py b/relstorage/adapters/interfaces.py → src/relstorage/adapters/interfaces.py
diff --git a/relstorage/adapters/locker.py → src/relstorage/adapters/locker.py b/relstorage/adapters/locker.py → src/relstorage/adapters/locker.py
diff --git a/relstorage/adapters/mover.py → src/relstorage/adapters/mover.py b/relstorage/adapters/mover.py → src/relstorage/adapters/mover.py
diff --git a/relstorage/adapters/mysql/__init__.py → src/relstorage/adapters/mysql/__init__.py b/relstorage/adapters/mysql/__init__.py → src/relstorage/adapters/mysql/__init__.py
diff --git a/relstorage/adapters/mysql/adapter.py → src/relstorage/adapters/mysql/adapter.py b/relstorage/adapters/mysql/adapter.py → src/relstorage/adapters/mysql/adapter.py
diff --git a/relstorage/adapters/mysql/connmanager.py → src/relstorage/adapters/mysql/connmanager.py b/relstorage/adapters/mysql/connmanager.py → src/relstorage/adapters/mysql/connmanager.py
diff --git a/relstorage/adapters/mysql/drivers.py → src/relstorage/adapters/mysql/drivers.py b/relstorage/adapters/mysql/drivers.py → src/relstorage/adapters/mysql/drivers.py
diff --git a/relstorage/adapters/mysql/locker.py → src/relstorage/adapters/mysql/locker.py b/relstorage/adapters/mysql/locker.py → src/relstorage/adapters/mysql/locker.py
diff --git a/relstorage/adapters/mysql/mover.py → src/relstorage/adapters/mysql/mover.py b/relstorage/adapters/mysql/mover.py → src/relstorage/adapters/mysql/mover.py
diff --git a/relstorage/adapters/mysql/oidallocator.py → ...relstorage/adapters/mysql/oidallocator.py b/relstorage/adapters/mysql/oidallocator.py → ...relstorage/adapters/mysql/oidallocator.py
diff --git a/relstorage/adapters/mysql/packundo.py → src/relstorage/adapters/mysql/packundo.py b/relstorage/adapters/mysql/packundo.py → src/relstorage/adapters/mysql/packundo.py
diff --git a/relstorage/adapters/mysql/schema.py → src/relstorage/adapters/mysql/schema.py b/relstorage/adapters/mysql/schema.py → src/relstorage/adapters/mysql/schema.py
diff --git a/relstorage/adapters/mysql/stats.py → src/relstorage/adapters/mysql/stats.py b/relstorage/adapters/mysql/stats.py → src/relstorage/adapters/mysql/stats.py
diff --git a/relstorage/adapters/mysql/txncontrol.py → src/relstorage/adapters/mysql/txncontrol.py b/relstorage/adapters/mysql/txncontrol.py → src/relstorage/adapters/mysql/txncontrol.py
diff --git a/relstorage/adapters/oidallocator.py → src/relstorage/adapters/oidallocator.py b/relstorage/adapters/oidallocator.py → src/relstorage/adapters/oidallocator.py
diff --git a/relstorage/adapters/oracle/__init__.py → src/relstorage/adapters/oracle/__init__.py b/relstorage/adapters/oracle/__init__.py → src/relstorage/adapters/oracle/__init__.py
diff --git a/relstorage/adapters/oracle/adapter.py → src/relstorage/adapters/oracle/adapter.py b/relstorage/adapters/oracle/adapter.py → src/relstorage/adapters/oracle/adapter.py
diff --git a/relstorage/adapters/oracle/batch.py → src/relstorage/adapters/oracle/batch.py b/relstorage/adapters/oracle/batch.py → src/relstorage/adapters/oracle/batch.py
diff --git a/relstorage/adapters/oracle/connmanager.py → ...relstorage/adapters/oracle/connmanager.py b/relstorage/adapters/oracle/connmanager.py → ...relstorage/adapters/oracle/connmanager.py
diff --git a/relstorage/adapters/oracle/drivers.py → src/relstorage/adapters/oracle/drivers.py b/relstorage/adapters/oracle/drivers.py → src/relstorage/adapters/oracle/drivers.py
diff --git a/relstorage/adapters/oracle/locker.py → src/relstorage/adapters/oracle/locker.py b/relstorage/adapters/oracle/locker.py → src/relstorage/adapters/oracle/locker.py
diff --git a/relstorage/adapters/oracle/mover.py → src/relstorage/adapters/oracle/mover.py b/relstorage/adapters/oracle/mover.py → src/relstorage/adapters/oracle/mover.py
diff --git a/relstorage/adapters/oracle/oidallocator.py → ...elstorage/adapters/oracle/oidallocator.py b/relstorage/adapters/oracle/oidallocator.py → ...elstorage/adapters/oracle/oidallocator.py
diff --git a/relstorage/adapters/oracle/packundo.py → src/relstorage/adapters/oracle/packundo.py b/relstorage/adapters/oracle/packundo.py → src/relstorage/adapters/oracle/packundo.py
diff --git a/relstorage/adapters/oracle/schema.py → src/relstorage/adapters/oracle/schema.py b/relstorage/adapters/oracle/schema.py → src/relstorage/adapters/oracle/schema.py
diff --git a/relstorage/adapters/oracle/scriptrunner.py → ...elstorage/adapters/oracle/scriptrunner.py b/relstorage/adapters/oracle/scriptrunner.py → ...elstorage/adapters/oracle/scriptrunner.py
diff --git a/relstorage/adapters/oracle/stats.py → src/relstorage/adapters/oracle/stats.py b/relstorage/adapters/oracle/stats.py → src/relstorage/adapters/oracle/stats.py
diff --git a/relstorage/adapters/oracle/txncontrol.py → src/relstorage/adapters/oracle/txncontrol.py b/relstorage/adapters/oracle/txncontrol.py → src/relstorage/adapters/oracle/txncontrol.py
diff --git a/relstorage/adapters/packundo.py → src/relstorage/adapters/packundo.py b/relstorage/adapters/packundo.py → src/relstorage/adapters/packundo.py
diff --git a/relstorage/adapters/poller.py → src/relstorage/adapters/poller.py b/relstorage/adapters/poller.py → src/relstorage/adapters/poller.py
diff --git a/relstorage/adapters/postgresql/__init__.py → ...elstorage/adapters/postgresql/__init__.py b/relstorage/adapters/postgresql/__init__.py → ...elstorage/adapters/postgresql/__init__.py
diff --git a/relstorage/adapters/postgresql/adapter.py → ...relstorage/adapters/postgresql/adapter.py b/relstorage/adapters/postgresql/adapter.py → ...relstorage/adapters/postgresql/adapter.py
diff --git a/...torage/adapters/postgresql/connmanager.py → ...torage/adapters/postgresql/connmanager.py b/...torage/adapters/postgresql/connmanager.py → ...torage/adapters/postgresql/connmanager.py
diff --git a/relstorage/adapters/postgresql/drivers.py → ...relstorage/adapters/postgresql/drivers.py b/relstorage/adapters/postgresql/drivers.py → ...relstorage/adapters/postgresql/drivers.py
diff --git a/relstorage/adapters/postgresql/locker.py → src/relstorage/adapters/postgresql/locker.py b/relstorage/adapters/postgresql/locker.py → src/relstorage/adapters/postgresql/locker.py
diff --git a/relstorage/adapters/postgresql/mover.py → src/relstorage/adapters/postgresql/mover.py b/relstorage/adapters/postgresql/mover.py → src/relstorage/adapters/postgresql/mover.py
diff --git a/...orage/adapters/postgresql/oidallocator.py → ...orage/adapters/postgresql/oidallocator.py b/...orage/adapters/postgresql/oidallocator.py → ...orage/adapters/postgresql/oidallocator.py
diff --git a/relstorage/adapters/postgresql/schema.py → src/relstorage/adapters/postgresql/schema.py b/relstorage/adapters/postgresql/schema.py → src/relstorage/adapters/postgresql/schema.py
diff --git a/relstorage/adapters/postgresql/stats.py → src/relstorage/adapters/postgresql/stats.py b/relstorage/adapters/postgresql/stats.py → src/relstorage/adapters/postgresql/stats.py
diff --git a/relstorage/adapters/postgresql/txncontrol.py → ...storage/adapters/postgresql/txncontrol.py b/relstorage/adapters/postgresql/txncontrol.py → ...storage/adapters/postgresql/txncontrol.py
diff --git a/relstorage/adapters/replica.py → src/relstorage/adapters/replica.py b/relstorage/adapters/replica.py → src/relstorage/adapters/replica.py
diff --git a/relstorage/adapters/schema.py → src/relstorage/adapters/schema.py b/relstorage/adapters/schema.py → src/relstorage/adapters/schema.py
diff --git a/relstorage/adapters/scriptrunner.py → src/relstorage/adapters/scriptrunner.py b/relstorage/adapters/scriptrunner.py → src/relstorage/adapters/scriptrunner.py
diff --git a/relstorage/adapters/stats.py → src/relstorage/adapters/stats.py b/relstorage/adapters/stats.py → src/relstorage/adapters/stats.py
diff --git a/relstorage/adapters/tests/__init__.py → src/relstorage/adapters/tests/__init__.py b/relstorage/adapters/tests/__init__.py → src/relstorage/adapters/tests/__init__.py
diff --git a/relstorage/adapters/tests/test_batch.py → src/relstorage/adapters/tests/test_batch.py b/relstorage/adapters/tests/test_batch.py → src/relstorage/adapters/tests/test_batch.py
diff --git a/...torage/adapters/tests/test_connmanager.py → ...torage/adapters/tests/test_connmanager.py b/...torage/adapters/tests/test_connmanager.py → ...torage/adapters/tests/test_connmanager.py
diff --git a/relstorage/adapters/tests/test_replica.py → ...relstorage/adapters/tests/test_replica.py b/relstorage/adapters/tests/test_replica.py → ...relstorage/adapters/tests/test_replica.py
diff --git a/relstorage/adapters/tests/test_util.py → src/relstorage/adapters/tests/test_util.py b/relstorage/adapters/tests/test_util.py → src/relstorage/adapters/tests/test_util.py
diff --git a/relstorage/adapters/txncontrol.py → src/relstorage/adapters/txncontrol.py b/relstorage/adapters/txncontrol.py → src/relstorage/adapters/txncontrol.py
diff --git a/relstorage/autotemp.py → src/relstorage/autotemp.py b/relstorage/autotemp.py → src/relstorage/autotemp.py
diff --git a/relstorage/blobhelper.py → src/relstorage/blobhelper.py b/relstorage/blobhelper.py → src/relstorage/blobhelper.py
diff --git a/relstorage/cache/__init__.py → src/relstorage/cache/__init__.py b/relstorage/cache/__init__.py → src/relstorage/cache/__init__.py
diff --git a/relstorage/cache/_cache_ring_build.py → src/relstorage/cache/_cache_ring_build.py b/relstorage/cache/_cache_ring_build.py → src/relstorage/cache/_cache_ring_build.py
diff --git a/relstorage/cache/cache_ring.c → src/relstorage/cache/cache_ring.c b/relstorage/cache/cache_ring.c → src/relstorage/cache/cache_ring.c
diff --git a/relstorage/cache/cache_ring.h → src/relstorage/cache/cache_ring.h b/relstorage/cache/cache_ring.h → src/relstorage/cache/cache_ring.h
diff --git a/relstorage/cache/cache_ring.py → src/relstorage/cache/cache_ring.py b/relstorage/cache/cache_ring.py → src/relstorage/cache/cache_ring.py
diff --git a/relstorage/cache/interfaces.py → src/relstorage/cache/interfaces.py b/relstorage/cache/interfaces.py → src/relstorage/cache/interfaces.py
diff --git a/relstorage/cache/local_client.py → src/relstorage/cache/local_client.py b/relstorage/cache/local_client.py → src/relstorage/cache/local_client.py
diff --git a/relstorage/cache/mapping.py → src/relstorage/cache/mapping.py b/relstorage/cache/mapping.py → src/relstorage/cache/mapping.py
diff --git a/relstorage/cache/micro_benchmark_results.rst → ...storage/cache/micro_benchmark_results.rst b/relstorage/cache/micro_benchmark_results.rst → ...storage/cache/micro_benchmark_results.rst
diff --git a/relstorage/cache/persistence.py → src/relstorage/cache/persistence.py b/relstorage/cache/persistence.py → src/relstorage/cache/persistence.py
diff --git a/relstorage/cache/storage_cache.py → src/relstorage/cache/storage_cache.py b/relstorage/cache/storage_cache.py → src/relstorage/cache/storage_cache.py
diff --git a/relstorage/cache/tests/__init__.py → src/relstorage/cache/tests/__init__.py b/relstorage/cache/tests/__init__.py → src/relstorage/cache/tests/__init__.py
diff --git a/relstorage/cache/tests/benchmarks.py → src/relstorage/cache/tests/benchmarks.py b/relstorage/cache/tests/benchmarks.py → src/relstorage/cache/tests/benchmarks.py
diff --git a/...rage/cache/tests/cache_trace_analysis.rst → ...rage/cache/tests/cache_trace_analysis.rst b/...rage/cache/tests/cache_trace_analysis.rst → ...rage/cache/tests/cache_trace_analysis.rst
diff --git a/relstorage/cache/tests/test_cache.py → src/relstorage/cache/tests/test_cache.py b/relstorage/cache/tests/test_cache.py → src/relstorage/cache/tests/test_cache.py
diff --git a/relstorage/cache/tests/test_cache_stats.py → ...elstorage/cache/tests/test_cache_stats.py b/relstorage/cache/tests/test_cache_stats.py → ...elstorage/cache/tests/test_cache_stats.py
diff --git a/relstorage/cache/trace.py → src/relstorage/cache/trace.py b/relstorage/cache/trace.py → src/relstorage/cache/trace.py
diff --git a/relstorage/component.xml → src/relstorage/component.xml b/relstorage/component.xml → src/relstorage/component.xml
diff --git a/relstorage/config.py → src/relstorage/config.py b/relstorage/config.py → src/relstorage/config.py
diff --git a/relstorage/iter.py → src/relstorage/iter.py b/relstorage/iter.py → src/relstorage/iter.py
diff --git a/relstorage/options.py → src/relstorage/options.py b/relstorage/options.py → src/relstorage/options.py
diff --git a/relstorage/pylibmc_wrapper.py → src/relstorage/pylibmc_wrapper.py b/relstorage/pylibmc_wrapper.py → src/relstorage/pylibmc_wrapper.py
diff --git a/relstorage/storage.py → src/relstorage/storage.py b/relstorage/storage.py → src/relstorage/storage.py
diff --git a/relstorage/tests/README-15.txt → src/relstorage/tests/README-15.txt b/relstorage/tests/README-15.txt → src/relstorage/tests/README-15.txt
diff --git a/relstorage/tests/README.txt → src/relstorage/tests/README.txt b/relstorage/tests/README.txt → src/relstorage/tests/README.txt
diff --git a/relstorage/tests/RecoveryStorage.py → src/relstorage/tests/RecoveryStorage.py b/relstorage/tests/RecoveryStorage.py → src/relstorage/tests/RecoveryStorage.py
diff --git a/relstorage/tests/__init__.py → src/relstorage/tests/__init__.py b/relstorage/tests/__init__.py → src/relstorage/tests/__init__.py
diff --git a/relstorage/tests/alltests.py → src/relstorage/tests/alltests.py b/relstorage/tests/alltests.py → src/relstorage/tests/alltests.py
diff --git a/relstorage/tests/bigmark.py → src/relstorage/tests/bigmark.py b/relstorage/tests/bigmark.py → src/relstorage/tests/bigmark.py
diff --git a/relstorage/tests/bigpack.py → src/relstorage/tests/bigpack.py b/relstorage/tests/bigpack.py → src/relstorage/tests/bigpack.py
diff --git a/relstorage/tests/blob/__init__.py → src/relstorage/tests/blob/__init__.py b/relstorage/tests/blob/__init__.py → src/relstorage/tests/blob/__init__.py
diff --git a/relstorage/tests/blob/blob_cache.test → src/relstorage/tests/blob/blob_cache.test b/relstorage/tests/blob/blob_cache.test → src/relstorage/tests/blob/blob_cache.test
diff --git a/relstorage/tests/blob/blob_connection.txt → ...relstorage/tests/blob/blob_connection.txt b/relstorage/tests/blob/blob_connection.txt → ...relstorage/tests/blob/blob_connection.txt
diff --git a/relstorage/tests/blob/blob_importexport.txt → ...lstorage/tests/blob/blob_importexport.txt b/relstorage/tests/blob/blob_importexport.txt → ...lstorage/tests/blob/blob_importexport.txt
diff --git a/relstorage/tests/blob/blob_packing.txt → src/relstorage/tests/blob/blob_packing.txt b/relstorage/tests/blob/blob_packing.txt → src/relstorage/tests/blob/blob_packing.txt
diff --git a/.../tests/blob/blob_packing_history_free.txt → .../tests/blob/blob_packing_history_free.txt b/.../tests/blob/blob_packing_history_free.txt → .../tests/blob/blob_packing_history_free.txt
diff --git a/relstorage/tests/blob/blob_transaction.txt → ...elstorage/tests/blob/blob_transaction.txt b/relstorage/tests/blob/blob_transaction.txt → ...elstorage/tests/blob/blob_transaction.txt
diff --git a/relstorage/tests/blob/testblob.py → src/relstorage/tests/blob/testblob.py b/relstorage/tests/blob/testblob.py → src/relstorage/tests/blob/testblob.py
diff --git a/relstorage/tests/fakecache.py → src/relstorage/tests/fakecache.py b/relstorage/tests/fakecache.py → src/relstorage/tests/fakecache.py
diff --git a/relstorage/tests/hftestbase.py → src/relstorage/tests/hftestbase.py b/relstorage/tests/hftestbase.py → src/relstorage/tests/hftestbase.py
diff --git a/relstorage/tests/hptestbase.py → src/relstorage/tests/hptestbase.py b/relstorage/tests/hptestbase.py → src/relstorage/tests/hptestbase.py
diff --git a/relstorage/tests/packstresstest.py → src/relstorage/tests/packstresstest.py b/relstorage/tests/packstresstest.py → src/relstorage/tests/packstresstest.py
diff --git a/relstorage/tests/reltestbase.py → src/relstorage/tests/reltestbase.py b/relstorage/tests/reltestbase.py → src/relstorage/tests/reltestbase.py
diff --git a/relstorage/tests/replicas.conf → src/relstorage/tests/replicas.conf b/relstorage/tests/replicas.conf → src/relstorage/tests/replicas.conf
diff --git a/relstorage/tests/ro_replicas.conf → src/relstorage/tests/ro_replicas.conf b/relstorage/tests/ro_replicas.conf → src/relstorage/tests/ro_replicas.conf
diff --git a/relstorage/tests/test_autotemp.py → src/relstorage/tests/test_autotemp.py b/relstorage/tests/test_autotemp.py → src/relstorage/tests/test_autotemp.py
diff --git a/relstorage/tests/test_blobhelper.py → src/relstorage/tests/test_blobhelper.py b/relstorage/tests/test_blobhelper.py → src/relstorage/tests/test_blobhelper.py
diff --git a/relstorage/tests/test_treemark.py → src/relstorage/tests/test_treemark.py b/relstorage/tests/test_treemark.py → src/relstorage/tests/test_treemark.py
diff --git a/relstorage/tests/test_zodbconvert.py → src/relstorage/tests/test_zodbconvert.py b/relstorage/tests/test_zodbconvert.py → src/relstorage/tests/test_zodbconvert.py
diff --git a/relstorage/tests/test_zodbpack.py → src/relstorage/tests/test_zodbpack.py b/relstorage/tests/test_zodbpack.py → src/relstorage/tests/test_zodbpack.py
diff --git a/relstorage/tests/test_zodburi.py → src/relstorage/tests/test_zodburi.py b/relstorage/tests/test_zodburi.py → src/relstorage/tests/test_zodburi.py
diff --git a/relstorage/tests/testmysql.py → src/relstorage/tests/testmysql.py b/relstorage/tests/testmysql.py → src/relstorage/tests/testmysql.py
diff --git a/relstorage/tests/testoracle.py → src/relstorage/tests/testoracle.py b/relstorage/tests/testoracle.py → src/relstorage/tests/testoracle.py
diff --git a/relstorage/tests/testpostgresql.py → src/relstorage/tests/testpostgresql.py b/relstorage/tests/testpostgresql.py → src/relstorage/tests/testpostgresql.py
diff --git a/relstorage/tests/util.py → src/relstorage/tests/util.py b/relstorage/tests/util.py → src/relstorage/tests/util.py
diff --git a/relstorage/treemark.py → src/relstorage/treemark.py b/relstorage/treemark.py → src/relstorage/treemark.py
diff --git a/relstorage/zodbconvert.py → src/relstorage/zodbconvert.py b/relstorage/zodbconvert.py → src/relstorage/zodbconvert.py
diff --git a/relstorage/zodbpack.py → src/relstorage/zodbpack.py b/relstorage/zodbpack.py → src/relstorage/zodbpack.py
diff --git a/relstorage/zodburi_resolver.py → src/relstorage/zodburi_resolver.py b/relstorage/zodburi_resolver.py → src/relstorage/zodburi_resolver.py