fix mypy

Author: davidhewitt

.github/workflows/ci.yml

@@ -34,9 +34,9 @@ jobs:
         with:
           python-version: "3.x"
 
-      - run: pip install tox
+      - run: pip install nox
 
-      - run: tox -e mypy
+      - run: nox -s mypy
 
   pytest:
     runs-on: "ubuntu-latest"
@@ -48,9 +48,9 @@ jobs:
         with:
           python-version: "3.x"
 
-      - run: pip install tox
+      - run: pip install nox
 
-      - run: tox -e pytest
+      - run: nox -s test
 
   build:
     name:  ${{ matrix.python-version }} ${{ matrix.platform.os }}-${{ matrix.platform.python-architecture }}

noxfile.py

@@ -23,3 +23,15 @@ def test_sdist_vendor(session: nox.Session):
         tf.extractall(str(dist))
     os.chdir(dist / "namespace_package-0.1.0")
     session.run("cargo", "build", "--offline", external=True)
+
+
+@nox.session()
+def mypy(session: nox.Session):
+    session.install("mypy", "fat_macho", "types-setuptools", ".")
+    session.run("mypy", "setuptools_rust", *session.posargs)
+
+
+@nox.session()
+def test(session: nox.Session):
+    session.install("pytest", ".")
+    session.run("pytest", "setuptools_rust", *session.posargs)

setuptools_rust/setuptools_ext.py

@@ -69,7 +69,9 @@ def make_distribution(self) -> None:
                     # set --manifest-path before vendor_path and after --sync to workaround that
                     # See https://docs.rs/clap/latest/clap/struct.Arg.html#method.multiple for detail
                     command.extend(["--manifest-path", manifest_paths[0], vendor_path])
-                    cargo_config = subprocess.run(command, check=True)
+                    subprocess.run(command, check=True)
+
+                    cargo_config = _CARGO_VENDOR_CONFIG
 
                     # Check whether `.cargo/config`/`.cargo/config.toml` already exists
                     existing_cargo_config = None
@@ -80,15 +82,14 @@ def make_distribution(self) -> None:
                         if filename in self.filelist.files:
                             existing_cargo_config = filename
                             break
+
                     if existing_cargo_config:
                         cargo_config_path = os.path.join(
                             base_dir, existing_cargo_config
                         )
                         # Append vendor config to original cargo config
                         with open(existing_cargo_config, "rb") as f:
-                            cargo_config = f.read() + b"\n" + cargo_config
-                    else:
-                        cargo_config = _CARGO_VENDOR_CONFIG
+                            cargo_config += f.read() + b"\n"
 
                     with open(cargo_config_path, "wb") as f:
                         f.write(cargo_config)