Merge branch 'master' into python-perf-prep

Author: jtdavis777

.github/workflows/build.yml

@@ -500,23 +500,21 @@ jobs:
        sh phpUnionVectorTest.sh
 
   build-swift:
-    name: Test Swift
+    name: Test Swift Linux
     strategy:
       matrix:
         swift: ["5.10", "6.1", "6.2"]
     # Only 22.04 has swift at the moment https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2204-Readme.md?plain=1#L30
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
-    - uses: vapor/swiftly-action@v0.2
+    - uses: swift-actions/setup-swift@v2
       with:
-        toolchain: ${{ matrix.swift }}
+        swift-version: ${{ matrix.swift }}
     - name: Get swift version
       run: swift --version
     - name: test
-      run: |
-        swift build --build-tests
-        swift test
+      run: swift test
 
   build-swift-windows:
     name: Test swift windows

conan/CMakeLists.txt

@@ -89,6 +89,17 @@ CC=clang PATH=$PATH:$(pwd)/swift-${SWIFT_VERSION}-RELEASE-debian12/usr/bin bazel
 
 If you are unsure which versions to use, check our CI config at `.bazelci/presubmit.yml`.
 
+## Building with Conan
+
+You can download and install flatbuffers using the [Conan](https://conan.io/) dependency manager:
+
+    conan install --requires="flatbuffers/[*]" --build=missing
+
+The flatbuffers package in Conan Center is maintained by
+[ConanCenterIndex](https://github.com/conan-io/conan-center-index) community.
+If the version is out of date or the package does not work,
+please create an issue or pull request on the [Conan Center Index repository](https://github.com/conan-io/conan-center-index).
+
 ## Building with VCPKG
 
 You can download and install flatbuffers using the [vcpkg](https://github.com/Microsoft/vcpkg/) dependency manager:

conan/build.py

@@ -1239,7 +1239,7 @@ class PythonGenerator : public BaseGenerator {
     auto& code = *code_ptr;
 
     code += "\n";
-    code += "def Create" + namer_.Type(struct_def);
+    code += "def Create" + namer_.Function(struct_def);
     code += "(builder";
   }
 
@@ -2884,7 +2884,8 @@ class PythonGenerator : public BaseGenerator {
         parser_.opts.one_file ? path_ : namer_.Directories(ns.components);
     EnsureDirExists(directories);
 
-    for (size_t i = path_.size() + 1; i != std::string::npos;
+    for (size_t i = directories.find(kPathSeparator, path_.size());
+         i != std::string::npos;
          i = directories.find(kPathSeparator, i + 1)) {
       const std::string init_py =
           directories.substr(0, i) + kPathSeparator + "__init__.py";