PYTHON-4163 Rename src/ to bsonjs/ to avoid setuptools bug that shado…

…ws bson package (#53)
mongodb-labs · Jan 26, 2024 · f45de61 · f45de61
1 parent 89893b4
commit f45de61
Show file tree

Hide file tree

Showing 72 changed files with 22 additions and 19 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,9 +1,9 @@
 include README.rst
 include CHANGELOG.rst
 include LICENSE
-recursive-include src LICENSE
-recursive-include src *.h
-recursive-include test *.py
+recursive-include bsonjs LICENSE
+recursive-include bsonjs *.h
+recursive-include bsonjs *.py
 exclude benchmark.py
 exclude build-wheels.sh
 exclude docker-build.sh

diff --git a/src/bson/bcon.c → bsonjs/bson/bcon.c b/src/bson/bcon.c → bsonjs/bson/bcon.c
diff --git a/src/bson/bcon.h → bsonjs/bson/bcon.h b/src/bson/bcon.h → bsonjs/bson/bcon.h
diff --git a/src/bson/bson-atomic.c → bsonjs/bson/bson-atomic.c b/src/bson/bson-atomic.c → bsonjs/bson/bson-atomic.c
diff --git a/src/bson/bson-atomic.h → bsonjs/bson/bson-atomic.h b/src/bson/bson-atomic.h → bsonjs/bson/bson-atomic.h
diff --git a/src/bson/bson-clock.c → bsonjs/bson/bson-clock.c b/src/bson/bson-clock.c → bsonjs/bson/bson-clock.c
diff --git a/src/bson/bson-clock.h → bsonjs/bson/bson-clock.h b/src/bson/bson-clock.h → bsonjs/bson/bson-clock.h
diff --git a/src/bson/bson-cmp.h → bsonjs/bson/bson-cmp.h b/src/bson/bson-cmp.h → bsonjs/bson/bson-cmp.h
diff --git a/src/bson/bson-compat.h → bsonjs/bson/bson-compat.h b/src/bson/bson-compat.h → bsonjs/bson/bson-compat.h
diff --git a/src/bson/bson-config.h → bsonjs/bson/bson-config.h b/src/bson/bson-config.h → bsonjs/bson/bson-config.h
diff --git a/src/bson/bson-context-private.h → bsonjs/bson/bson-context-private.h b/src/bson/bson-context-private.h → bsonjs/bson/bson-context-private.h
diff --git a/src/bson/bson-context.c → bsonjs/bson/bson-context.c b/src/bson/bson-context.c → bsonjs/bson/bson-context.c
diff --git a/src/bson/bson-context.h → bsonjs/bson/bson-context.h b/src/bson/bson-context.h → bsonjs/bson/bson-context.h
diff --git a/src/bson/bson-decimal128.c → bsonjs/bson/bson-decimal128.c b/src/bson/bson-decimal128.c → bsonjs/bson/bson-decimal128.c
diff --git a/src/bson/bson-decimal128.h → bsonjs/bson/bson-decimal128.h b/src/bson/bson-decimal128.h → bsonjs/bson/bson-decimal128.h
diff --git a/src/bson/bson-dsl.h → bsonjs/bson/bson-dsl.h b/src/bson/bson-dsl.h → bsonjs/bson/bson-dsl.h
diff --git a/src/bson/bson-endian.h → bsonjs/bson/bson-endian.h b/src/bson/bson-endian.h → bsonjs/bson/bson-endian.h
diff --git a/src/bson/bson-error.c → bsonjs/bson/bson-error.c b/src/bson/bson-error.c → bsonjs/bson/bson-error.c
diff --git a/src/bson/bson-error.h → bsonjs/bson/bson-error.h b/src/bson/bson-error.h → bsonjs/bson/bson-error.h
diff --git a/src/bson/bson-iso8601-private.h → bsonjs/bson/bson-iso8601-private.h b/src/bson/bson-iso8601-private.h → bsonjs/bson/bson-iso8601-private.h
diff --git a/src/bson/bson-iso8601.c → bsonjs/bson/bson-iso8601.c b/src/bson/bson-iso8601.c → bsonjs/bson/bson-iso8601.c
diff --git a/src/bson/bson-iter.c → bsonjs/bson/bson-iter.c b/src/bson/bson-iter.c → bsonjs/bson/bson-iter.c
diff --git a/src/bson/bson-iter.h → bsonjs/bson/bson-iter.h b/src/bson/bson-iter.h → bsonjs/bson/bson-iter.h
diff --git a/src/bson/bson-json-private.h → bsonjs/bson/bson-json-private.h b/src/bson/bson-json-private.h → bsonjs/bson/bson-json-private.h
diff --git a/src/bson/bson-json.c → bsonjs/bson/bson-json.c b/src/bson/bson-json.c → bsonjs/bson/bson-json.c
diff --git a/src/bson/bson-json.h → bsonjs/bson/bson-json.h b/src/bson/bson-json.h → bsonjs/bson/bson-json.h
diff --git a/src/bson/bson-keys.c → bsonjs/bson/bson-keys.c b/src/bson/bson-keys.c → bsonjs/bson/bson-keys.c
diff --git a/src/bson/bson-keys.h → bsonjs/bson/bson-keys.h b/src/bson/bson-keys.h → bsonjs/bson/bson-keys.h
diff --git a/src/bson/bson-macros.h → bsonjs/bson/bson-macros.h b/src/bson/bson-macros.h → bsonjs/bson/bson-macros.h
diff --git a/src/bson/bson-md5.c → bsonjs/bson/bson-md5.c b/src/bson/bson-md5.c → bsonjs/bson/bson-md5.c
diff --git a/src/bson/bson-md5.h → bsonjs/bson/bson-md5.h b/src/bson/bson-md5.h → bsonjs/bson/bson-md5.h
diff --git a/src/bson/bson-memory.c → bsonjs/bson/bson-memory.c b/src/bson/bson-memory.c → bsonjs/bson/bson-memory.c
diff --git a/src/bson/bson-memory.h → bsonjs/bson/bson-memory.h b/src/bson/bson-memory.h → bsonjs/bson/bson-memory.h
diff --git a/src/bson/bson-oid.c → bsonjs/bson/bson-oid.c b/src/bson/bson-oid.c → bsonjs/bson/bson-oid.c
diff --git a/src/bson/bson-oid.h → bsonjs/bson/bson-oid.h b/src/bson/bson-oid.h → bsonjs/bson/bson-oid.h
diff --git a/src/bson/bson-prelude.h → bsonjs/bson/bson-prelude.h b/src/bson/bson-prelude.h → bsonjs/bson/bson-prelude.h
diff --git a/src/bson/bson-private.h → bsonjs/bson/bson-private.h b/src/bson/bson-private.h → bsonjs/bson/bson-private.h
diff --git a/src/bson/bson-reader.c → bsonjs/bson/bson-reader.c b/src/bson/bson-reader.c → bsonjs/bson/bson-reader.c
diff --git a/src/bson/bson-reader.h → bsonjs/bson/bson-reader.h b/src/bson/bson-reader.h → bsonjs/bson/bson-reader.h
diff --git a/src/bson/bson-string.c → bsonjs/bson/bson-string.c b/src/bson/bson-string.c → bsonjs/bson/bson-string.c
diff --git a/src/bson/bson-string.h → bsonjs/bson/bson-string.h b/src/bson/bson-string.h → bsonjs/bson/bson-string.h
diff --git a/src/bson/bson-timegm-private.h → bsonjs/bson/bson-timegm-private.h b/src/bson/bson-timegm-private.h → bsonjs/bson/bson-timegm-private.h
diff --git a/src/bson/bson-timegm.c → bsonjs/bson/bson-timegm.c b/src/bson/bson-timegm.c → bsonjs/bson/bson-timegm.c
diff --git a/src/bson/bson-types.h → bsonjs/bson/bson-types.h b/src/bson/bson-types.h → bsonjs/bson/bson-types.h
diff --git a/src/bson/bson-utf8.c → bsonjs/bson/bson-utf8.c b/src/bson/bson-utf8.c → bsonjs/bson/bson-utf8.c
diff --git a/src/bson/bson-utf8.h → bsonjs/bson/bson-utf8.h b/src/bson/bson-utf8.h → bsonjs/bson/bson-utf8.h
diff --git a/src/bson/bson-value.c → bsonjs/bson/bson-value.c b/src/bson/bson-value.c → bsonjs/bson/bson-value.c
diff --git a/src/bson/bson-value.h → bsonjs/bson/bson-value.h b/src/bson/bson-value.h → bsonjs/bson/bson-value.h
diff --git a/src/bson/bson-version-functions.c → bsonjs/bson/bson-version-functions.c b/src/bson/bson-version-functions.c → bsonjs/bson/bson-version-functions.c
diff --git a/src/bson/bson-version-functions.h → bsonjs/bson/bson-version-functions.h b/src/bson/bson-version-functions.h → bsonjs/bson/bson-version-functions.h
diff --git a/src/bson/bson-version.h → bsonjs/bson/bson-version.h b/src/bson/bson-version.h → bsonjs/bson/bson-version.h
diff --git a/src/bson/bson-writer.c → bsonjs/bson/bson-writer.c b/src/bson/bson-writer.c → bsonjs/bson/bson-writer.c
diff --git a/src/bson/bson-writer.h → bsonjs/bson/bson-writer.h b/src/bson/bson-writer.h → bsonjs/bson/bson-writer.h
diff --git a/src/bson/bson.c → bsonjs/bson/bson.c b/src/bson/bson.c → bsonjs/bson/bson.c
diff --git a/src/bson/bson.h → bsonjs/bson/bson.h b/src/bson/bson.h → bsonjs/bson/bson.h
diff --git a/src/bsonjs.c → bsonjs/bsonjs.c b/src/bsonjs.c → bsonjs/bsonjs.c
diff --git a/src/bsonjs.h → bsonjs/bsonjs.h b/src/bsonjs.h → bsonjs/bsonjs.h
diff --git a/src/common/common-b64-private.h → bsonjs/common/common-b64-private.h b/src/common/common-b64-private.h → bsonjs/common/common-b64-private.h
diff --git a/src/common/common-b64.c → bsonjs/common/common-b64.c b/src/common/common-b64.c → bsonjs/common/common-b64.c
diff --git a/src/common/common-config.h → bsonjs/common/common-config.h b/src/common/common-config.h → bsonjs/common/common-config.h
diff --git a/src/common/common-macros-private.h → bsonjs/common/common-macros-private.h b/src/common/common-macros-private.h → bsonjs/common/common-macros-private.h
diff --git a/src/common/common-md5-private.h → bsonjs/common/common-md5-private.h b/src/common/common-md5-private.h → bsonjs/common/common-md5-private.h
diff --git a/src/common/common-md5.c → bsonjs/common/common-md5.c b/src/common/common-md5.c → bsonjs/common/common-md5.c
diff --git a/src/common/common-prelude.h → bsonjs/common/common-prelude.h b/src/common/common-prelude.h → bsonjs/common/common-prelude.h
diff --git a/src/common/common-thread-private.h → bsonjs/common/common-thread-private.h b/src/common/common-thread-private.h → bsonjs/common/common-thread-private.h
diff --git a/src/common/common-thread.c → bsonjs/common/common-thread.c b/src/common/common-thread.c → bsonjs/common/common-thread.c
diff --git a/src/jsonsl/LICENSE → bsonjs/jsonsl/LICENSE b/src/jsonsl/LICENSE → bsonjs/jsonsl/LICENSE
diff --git a/src/jsonsl/jsonsl.c → bsonjs/jsonsl/jsonsl.c b/src/jsonsl/jsonsl.c → bsonjs/jsonsl/jsonsl.c
diff --git a/src/jsonsl/jsonsl.h → bsonjs/jsonsl/jsonsl.h b/src/jsonsl/jsonsl.h → bsonjs/jsonsl/jsonsl.h
diff --git a/pyproject.toml b/pyproject.toml
@@ -2,6 +2,9 @@
 requires = ["setuptools>=62.0"]
 build-backend = "setuptools.build_meta"
 
+[tool.setuptools]
+packages = ["bsonjs"]
+
 [project]
 name = "python-bsonjs"
 version = "0.3.0"

diff --git a/setup.py b/setup.py
@@ -28,11 +28,11 @@
     ext_modules=[
         Extension(
             "bsonjs",
-            sources=["src/bsonjs.c"] + glob.glob("src/*/*.c"),
-            include_dirs=["src",
-                          "src/bson",
-                          "src/jsonsl",
-                          "src/common"],
+            sources=["bsonjs/bsonjs.c"] + glob.glob("bsonjs/*/*.c"),
+            include_dirs=["bsonjs",
+                          "bsonjs/bson",
+                          "bsonjs/jsonsl",
+                          "bsonjs/common"],
             py_limited_api=True,
             define_macros=[("BSON_COMPILATION", 1),
                            ("Py_LIMITED_API", "0x03060000")],

diff --git a/vendor.sh b/vendor.sh
@@ -8,20 +8,20 @@ python build/calc_release_version.py > VERSION_CURRENT
 mkdir cmake-build && cd cmake-build
 cmake -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_MONGOC=OFF ..
 cd ../../
-rm -r python-bsonjs/src/bson
-rm -r python-bsonjs/src/jsonsl
-rm -r python-bsonjs/src/common
-rsync -r mongo-c-driver/src/libbson/src/bson/*.[hc] python-bsonjs/src/bson/
-rsync -r mongo-c-driver/src/libbson/src/jsonsl/*.[hc] python-bsonjs/src/jsonsl/
-rsync -r mongo-c-driver/src/libbson/src/jsonsl/LICENSE python-bsonjs/src/jsonsl/
+rm -r python-bsonjs/bsonjs/bson
+rm -r python-bsonjs/bsonjs/jsonsl
+rm -r python-bsonjs/bsonjs/common
+rsync -r mongo-c-driver/src/libbson/src/bson/*.[hc] python-bsonjs/bsonjs/bson/
+rsync -r mongo-c-driver/src/libbson/src/jsonsl/*.[hc] python-bsonjs/bsonjs/jsonsl/
+rsync -r mongo-c-driver/src/libbson/src/jsonsl/LICENSE python-bsonjs/bsonjs/jsonsl/
 
-rsync -r mongo-c-driver/src/common/*.[hc] python-bsonjs/src/common/
-rsync -r mongo-c-driver/cmake-build/src/common/*.[hc] python-bsonjs/src/common/
+rsync -r mongo-c-driver/src/common/*.[hc] python-bsonjs/bsonjs/common/
+rsync -r mongo-c-driver/cmake-build/src/common/*.[hc] python-bsonjs/bsonjs/common/
 
-rsync -r mongo-c-driver/cmake-build/src/libbson/src/bson/*.[hc] python-bsonjs/src/bson/
+rsync -r mongo-c-driver/cmake-build/src/libbson/src/bson/*.[hc] python-bsonjs/bsonjs/bson/
 
 # Ignore autogenerated bson-config.h
 cd python-bsonjs/
-git diff -- src/bson/bson-config.h | tee
+git diff -- bsonjs/bson/bson-config.h | tee
 echo "**** Review libbson's autogenerated src/bson/bson-config.h (above) for newly added (or removed) macros ****"
-git checkout -- src/bson/bson-config.h
+git checkout -- bsonjs/bson/bson-config.h