Merge 9090671 into 4bf93f5

zopefoundation · Mar 30, 2021 · 65ad861 · 65ad861
2 parents 4bf93f5 + 9090671
commit 65ad861
Show file tree

Hide file tree

Showing 70 changed files with 27 additions and 27 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -68,7 +68,7 @@ env:
 
   ###
   # caching
-  # This is where we'd set up ccache, but this compiles so fast its not worth it.
+  # This is where we'd set up ccache
   ###
 
 
@@ -218,7 +218,7 @@ jobs:
           # Unzip into src/ so that testrunner can find the .so files
           # when we ask it to load tests from that directory. This
           # might also save some build time?
-          unzip -n dist/BTrees-*whl -d .
+          unzip -n dist/BTrees-*whl -d src
           pip install -U -e .[test,ZODB]
       - name: Set coverage status
         # coverage is too slow on PyPy. We can't submit it from macOS (see that action),
@@ -232,14 +232,14 @@ jobs:
         # runs once under PyPy anyway (but with coverage takes forever).
         run: |
           if [[ "$WITH_COVERAGE" == "1" ]]; then
-              coverage run -p -m unittest discover -s BTrees -t .
+              coverage run -p -m unittest discover -s src
           else
-              python -m unittest discover -s BTrees -t .
+              python -m unittest discover -s src
           fi
       - name: Run PURE_PYTHON tests
         if: (matrix.python-version == 2.7 || matrix.python-version == 3.9) && startsWith(runner.os, 'Linux')
         run: |
-          PURE_PYTHON=1 coverage run -p -m unittest discover -s .
+          PURE_PYTHON=1 coverage run -p -m unittest discover -s src
       - name: Report coverage
         run: |
           coverage combine || true

diff --git a/.manylinux-install.sh b/.manylinux-install.sh
@@ -55,7 +55,7 @@ for variant in `ls -d /opt/python/cp{27,36,37,38,39}*`; do
             # version, and we can't import the C extensions.
             "${PYBIN}/pip" install -e .[test]
             "${PYBIN}/python" -c 'import BTrees.OOBTree; print(BTrees.OOBTree.BTree, BTrees.OOBTree.BTreePy)'
-            "${PYBIN}/python" -m unittest discover -s BTrees -t . -v
+            "${PYBIN}/python" -m unittest discover -s src
         fi
     fi
     rm -rf /io/build /io/*.egg-info

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,4 +1,3 @@
-prune terryfy
 include pyproject.toml
 
 include *.txt
@@ -9,7 +8,7 @@ include tox.ini
 include .coveragerc
 
 recursive-include docs *
-recursive-include BTrees *
+recursive-include src *
 recursive-include .github *
 
 global-exclude *.dll

diff --git a/appveyor.yml b/appveyor.yml
@@ -15,6 +15,8 @@ environment:
     - python: 37-x64
     - python: 38
     - python: 38-x64
+    - python: 39
+    - python: 39-x64
 
 install:
   - "SET PATH=C:\\Python%PYTHON%;c:\\Python%PYTHON%\\scripts;%PATH%"
@@ -34,7 +36,7 @@ build_script:
   - python -W ignore setup.py -q bdist_wheel
 
 test_script:
-  - zope-testrunner --test-path=.
+  - zope-testrunner --test-path=src
 
 artifacts:
   - path: 'dist\*.whl'

diff --git a/setup.py b/setup.py
@@ -12,7 +12,6 @@
 #
 ##############################################################################
 from __future__ import print_function
-version = '4.7.3.dev0'
 
 import os
 import sys
@@ -26,6 +25,7 @@
 from setuptools import setup
 from setuptools.command.build_ext import build_ext
 
+version = '4.7.3.dev0'
 
 def _read(fname):
     here = os.path.abspath(os.path.dirname(__file__))
@@ -93,16 +93,16 @@ def __str__(self):
 
 # Set up dependencies for the BTrees package
 base_btrees_depends = [
-    "BTrees/BTreeItemsTemplate.c",
-    "BTrees/BTreeModuleTemplate.c",
-    "BTrees/BTreeTemplate.c",
-    "BTrees/BucketTemplate.c",
-    "BTrees/MergeTemplate.c",
-    "BTrees/SetOpTemplate.c",
-    "BTrees/SetTemplate.c",
-    "BTrees/TreeSetTemplate.c",
-    "BTrees/sorters.c",
-    ]
+    "src/BTrees/BTreeItemsTemplate.c",
+    "src/BTrees/BTreeModuleTemplate.c",
+    "src/BTrees/BTreeTemplate.c",
+    "src/BTrees/BucketTemplate.c",
+    "src/BTrees/MergeTemplate.c",
+    "src/BTrees/SetOpTemplate.c",
+    "src/BTrees/SetTemplate.c",
+    "src/BTrees/TreeSetTemplate.c",
+    "src/BTrees/sorters.c",
+]
 
 FLAVORS = {
     "O": "object",
@@ -143,15 +143,15 @@ def __str__(self):
     "fs",
 )
 
-KEY_H = "BTrees/%skeymacros.h"
-VALUE_H = "BTrees/%svaluemacros.h"
+KEY_H = "src/BTrees/%skeymacros.h"
+VALUE_H = "src/BTrees/%svaluemacros.h"
 
 
 def BTreeExtension(family):
     key = family[0]
     value = family[1]
     name = "BTrees._%sBTree" % family
-    sources = ["BTrees/_%sBTree.c" % family]
+    sources = ["src/BTrees/_%sBTree.c" % family]
     kwargs = {"include_dirs": include}
     if family != "fs":
         kwargs["depends"] = (base_btrees_depends + [KEY_H % FLAVORS[key],
@@ -209,9 +209,8 @@ def BTreeExtension(family):
       url="https://github.com/zopefoundation/BTrees",
       license="ZPL 2.1",
       platforms=["any"],
-      # Make sure we don't get 'terryfy' included in wheels
-      # created on macOS CI
-      packages=find_packages(include=("BTrees",)),
+      packages=find_packages('src'),
+      package_dir={'': 'src'},
       include_package_data=True,
       zip_safe=False,
       ext_modules=ext_modules,

diff --git a/BTrees/BTreeItemsTemplate.c → src/BTrees/BTreeItemsTemplate.c b/BTrees/BTreeItemsTemplate.c → src/BTrees/BTreeItemsTemplate.c
diff --git a/BTrees/BTreeModuleTemplate.c → src/BTrees/BTreeModuleTemplate.c b/BTrees/BTreeModuleTemplate.c → src/BTrees/BTreeModuleTemplate.c
diff --git a/BTrees/BTreeTemplate.c → src/BTrees/BTreeTemplate.c b/BTrees/BTreeTemplate.c → src/BTrees/BTreeTemplate.c
diff --git a/BTrees/BucketTemplate.c → src/BTrees/BucketTemplate.c b/BTrees/BucketTemplate.c → src/BTrees/BucketTemplate.c
diff --git a/BTrees/Interfaces.py → src/BTrees/Interfaces.py b/BTrees/Interfaces.py → src/BTrees/Interfaces.py
diff --git a/BTrees/Length.py → src/BTrees/Length.py b/BTrees/Length.py → src/BTrees/Length.py
diff --git a/BTrees/MergeTemplate.c → src/BTrees/MergeTemplate.c b/BTrees/MergeTemplate.c → src/BTrees/MergeTemplate.c
diff --git a/BTrees/SetOpTemplate.c → src/BTrees/SetOpTemplate.c b/BTrees/SetOpTemplate.c → src/BTrees/SetOpTemplate.c
diff --git a/BTrees/SetOpTemplate.h → src/BTrees/SetOpTemplate.h b/BTrees/SetOpTemplate.h → src/BTrees/SetOpTemplate.h
diff --git a/BTrees/SetTemplate.c → src/BTrees/SetTemplate.c b/BTrees/SetTemplate.c → src/BTrees/SetTemplate.c
diff --git a/BTrees/TreeSetTemplate.c → src/BTrees/TreeSetTemplate.c b/BTrees/TreeSetTemplate.c → src/BTrees/TreeSetTemplate.c
diff --git a/BTrees/_IFBTree.c → src/BTrees/_IFBTree.c b/BTrees/_IFBTree.c → src/BTrees/_IFBTree.c
diff --git a/BTrees/_IIBTree.c → src/BTrees/_IIBTree.c b/BTrees/_IIBTree.c → src/BTrees/_IIBTree.c
diff --git a/BTrees/_IOBTree.c → src/BTrees/_IOBTree.c b/BTrees/_IOBTree.c → src/BTrees/_IOBTree.c
diff --git a/BTrees/_IUBTree.c → src/BTrees/_IUBTree.c b/BTrees/_IUBTree.c → src/BTrees/_IUBTree.c
diff --git a/BTrees/_LFBTree.c → src/BTrees/_LFBTree.c b/BTrees/_LFBTree.c → src/BTrees/_LFBTree.c
diff --git a/BTrees/_LLBTree.c → src/BTrees/_LLBTree.c b/BTrees/_LLBTree.c → src/BTrees/_LLBTree.c
diff --git a/BTrees/_LOBTree.c → src/BTrees/_LOBTree.c b/BTrees/_LOBTree.c → src/BTrees/_LOBTree.c
diff --git a/BTrees/_LQBTree.c → src/BTrees/_LQBTree.c b/BTrees/_LQBTree.c → src/BTrees/_LQBTree.c
diff --git a/BTrees/_OIBTree.c → src/BTrees/_OIBTree.c b/BTrees/_OIBTree.c → src/BTrees/_OIBTree.c
diff --git a/BTrees/_OLBTree.c → src/BTrees/_OLBTree.c b/BTrees/_OLBTree.c → src/BTrees/_OLBTree.c
diff --git a/BTrees/_OOBTree.c → src/BTrees/_OOBTree.c b/BTrees/_OOBTree.c → src/BTrees/_OOBTree.c
diff --git a/BTrees/_OQBTree.c → src/BTrees/_OQBTree.c b/BTrees/_OQBTree.c → src/BTrees/_OQBTree.c
diff --git a/BTrees/_OUBTree.c → src/BTrees/_OUBTree.c b/BTrees/_OUBTree.c → src/BTrees/_OUBTree.c
diff --git a/BTrees/_QFBTree.c → src/BTrees/_QFBTree.c b/BTrees/_QFBTree.c → src/BTrees/_QFBTree.c
diff --git a/BTrees/_QLBTree.c → src/BTrees/_QLBTree.c b/BTrees/_QLBTree.c → src/BTrees/_QLBTree.c
diff --git a/BTrees/_QOBTree.c → src/BTrees/_QOBTree.c b/BTrees/_QOBTree.c → src/BTrees/_QOBTree.c
diff --git a/BTrees/_QQBTree.c → src/BTrees/_QQBTree.c b/BTrees/_QQBTree.c → src/BTrees/_QQBTree.c
diff --git a/BTrees/_UFBTree.c → src/BTrees/_UFBTree.c b/BTrees/_UFBTree.c → src/BTrees/_UFBTree.c
diff --git a/BTrees/_UIBTree.c → src/BTrees/_UIBTree.c b/BTrees/_UIBTree.c → src/BTrees/_UIBTree.c
diff --git a/BTrees/_UOBTree.c → src/BTrees/_UOBTree.c b/BTrees/_UOBTree.c → src/BTrees/_UOBTree.c
diff --git a/BTrees/_UUBTree.c → src/BTrees/_UUBTree.c b/BTrees/_UUBTree.c → src/BTrees/_UUBTree.c
diff --git a/BTrees/__init__.py → src/BTrees/__init__.py b/BTrees/__init__.py → src/BTrees/__init__.py
diff --git a/BTrees/_base.py → src/BTrees/_base.py b/BTrees/_base.py → src/BTrees/_base.py
diff --git a/BTrees/_compat.h → src/BTrees/_compat.h b/BTrees/_compat.h → src/BTrees/_compat.h
diff --git a/BTrees/_compat.py → src/BTrees/_compat.py b/BTrees/_compat.py → src/BTrees/_compat.py
diff --git a/BTrees/_datatypes.py → src/BTrees/_datatypes.py b/BTrees/_datatypes.py → src/BTrees/_datatypes.py
diff --git a/BTrees/_fsBTree.c → src/BTrees/_fsBTree.c b/BTrees/_fsBTree.c → src/BTrees/_fsBTree.c
diff --git a/BTrees/_module_builder.py → src/BTrees/_module_builder.py b/BTrees/_module_builder.py → src/BTrees/_module_builder.py
diff --git a/BTrees/check.py → src/BTrees/check.py b/BTrees/check.py → src/BTrees/check.py
diff --git a/BTrees/floatvaluemacros.h → src/BTrees/floatvaluemacros.h b/BTrees/floatvaluemacros.h → src/BTrees/floatvaluemacros.h
diff --git a/BTrees/fsBTree.py → src/BTrees/fsBTree.py b/BTrees/fsBTree.py → src/BTrees/fsBTree.py
diff --git a/BTrees/intkeymacros.h → src/BTrees/intkeymacros.h b/BTrees/intkeymacros.h → src/BTrees/intkeymacros.h
diff --git a/BTrees/intvaluemacros.h → src/BTrees/intvaluemacros.h b/BTrees/intvaluemacros.h → src/BTrees/intvaluemacros.h
diff --git a/BTrees/objectkeymacros.h → src/BTrees/objectkeymacros.h b/BTrees/objectkeymacros.h → src/BTrees/objectkeymacros.h
diff --git a/BTrees/objectvaluemacros.h → src/BTrees/objectvaluemacros.h b/BTrees/objectvaluemacros.h → src/BTrees/objectvaluemacros.h
diff --git a/BTrees/sorters.c → src/BTrees/sorters.c b/BTrees/sorters.c → src/BTrees/sorters.c
diff --git a/BTrees/tests/__init__.py → src/BTrees/tests/__init__.py b/BTrees/tests/__init__.py → src/BTrees/tests/__init__.py
diff --git a/BTrees/tests/_test_builder.py → src/BTrees/tests/_test_builder.py b/BTrees/tests/_test_builder.py → src/BTrees/tests/_test_builder.py
diff --git a/BTrees/tests/common.py → src/BTrees/tests/common.py b/BTrees/tests/common.py → src/BTrees/tests/common.py
diff --git a/BTrees/tests/testBTrees.py → src/BTrees/tests/testBTrees.py b/BTrees/tests/testBTrees.py → src/BTrees/tests/testBTrees.py
diff --git a/BTrees/tests/testBTreesUnicode.py → src/BTrees/tests/testBTreesUnicode.py b/BTrees/tests/testBTreesUnicode.py → src/BTrees/tests/testBTreesUnicode.py
diff --git a/BTrees/tests/testConflict.py → src/BTrees/tests/testConflict.py b/BTrees/tests/testConflict.py → src/BTrees/tests/testConflict.py
diff --git a/BTrees/tests/testPersistency.py → src/BTrees/tests/testPersistency.py b/BTrees/tests/testPersistency.py → src/BTrees/tests/testPersistency.py
diff --git a/BTrees/tests/test_Length.py → src/BTrees/tests/test_Length.py b/BTrees/tests/test_Length.py → src/BTrees/tests/test_Length.py
diff --git a/BTrees/tests/test_OOBTree.py → src/BTrees/tests/test_OOBTree.py b/BTrees/tests/test_OOBTree.py → src/BTrees/tests/test_OOBTree.py
diff --git a/BTrees/tests/test__base.py → src/BTrees/tests/test__base.py b/BTrees/tests/test__base.py → src/BTrees/tests/test__base.py
diff --git a/BTrees/tests/test__datatypes.py → src/BTrees/tests/test__datatypes.py b/BTrees/tests/test__datatypes.py → src/BTrees/tests/test__datatypes.py
diff --git a/BTrees/tests/test_btreesubclass.py → src/BTrees/tests/test_btreesubclass.py b/BTrees/tests/test_btreesubclass.py → src/BTrees/tests/test_btreesubclass.py
diff --git a/BTrees/tests/test_check.py → src/BTrees/tests/test_check.py b/BTrees/tests/test_check.py → src/BTrees/tests/test_check.py
diff --git a/BTrees/tests/test_dynamic_btrees.py → src/BTrees/tests/test_dynamic_btrees.py b/BTrees/tests/test_dynamic_btrees.py → src/BTrees/tests/test_dynamic_btrees.py
diff --git a/BTrees/tests/test_fsBTree.py → src/BTrees/tests/test_fsBTree.py b/BTrees/tests/test_fsBTree.py → src/BTrees/tests/test_fsBTree.py
diff --git a/BTrees/tests/test_utils.py → src/BTrees/tests/test_utils.py b/BTrees/tests/test_utils.py → src/BTrees/tests/test_utils.py
diff --git a/BTrees/utils.py → src/BTrees/utils.py b/BTrees/utils.py → src/BTrees/utils.py
diff --git a/tox.ini b/tox.ini
@@ -12,7 +12,7 @@ extras =
 commands =
     # Temporary work around. Avoid zope.testrunner pending
     # https://github.com/zopefoundation/zope.security/issues/71
-    python -m unittest discover -s BTrees -t . {posargs}
+    python -m unittest discover -s src {posargs}
 setenv =
     PYTHONFAULTHANDLER=1
     PYTHONDEVMODE=1