test rebuild

Author: joshuarli

.github/workflows/build.yml

@@ -52,7 +52,7 @@ jobs:
 
   collect-and-deploy:
     needs: [linux, macos]
-    if: github.event_name != 'pull_request'
+#    if: github.event_name != 'pull_request'
     runs-on: ubuntu-latest
     permissions:
       id-token: write
@@ -66,9 +66,11 @@ jobs:
     - uses: actions/download-artifact@v4
       with:
         path: dist
-    - run: python3 -um make_index --pypi-url https://pypi.devinfra.sentry.io --dest index
-    - uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
-      with:
-        workload_identity_provider: projects/868781662168/locations/global/workloadIdentityPools/prod-github/providers/github-oidc-pool
-        service_account: [email protected]
-    - run: python3 -uS bin/upload-artifacts
+    - run: python3 -um make_index --rebuild --pypi-url https://pypi.devinfra.sentry.io --dest index
+    - run: tree index
+
+    # - uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
+    #   with:
+    #     workload_identity_provider: projects/868781662168/locations/global/workloadIdentityPools/prod-github/providers/github-oidc-pool
+    #     service_account: [email protected]
+    # - run: python3 -uS bin/upload-artifacts

make_index.py

@@ -60,14 +60,12 @@ def main(argv: Sequence[str] | None = None) -> int:
     parser.add_argument("--dist", default="dist")
     parser.add_argument("--pypi-url", required=True)
     parser.add_argument("--dest", required=True)
+    parser.add_argument("--rebuild", default=False)
     args = parser.parse_args(argv)
 
     url = urllib.parse.urljoin(args.pypi_url, "packages.json")
     packages = [json.loads(line) for line in urllib.request.urlopen(url)]
-    on_pypi = {package["filename"] for package in packages}
-    has_core_metadata = {
-        package["filename"] for package in packages if package.get("core_metadata")
-    }
+    on_pypi = {package["filename"] for package in packages} if not args.rebuild else {}
 
     shutil.rmtree(args.dest, ignore_errors=True)
     os.makedirs(args.dest, exist_ok=True)
@@ -88,12 +86,10 @@ def main(argv: Sequence[str] | None = None) -> int:
     ):
         basename = os.path.basename(filename)
 
-        # core metadata backfill
-        if filename in has_core_metadata:
-            if basename in on_pypi:
-                raise AssertionError(f"{basename}: already on pypi?")
-            elif basename in seen:
-                continue
+        if basename in on_pypi:
+            raise AssertionError(f"{basename}: already on pypi?")
+        elif basename in seen:
+            continue
 
         seen.add(basename)
         package_info = _make_info(filename)
@@ -114,19 +110,21 @@ def main(argv: Sequence[str] | None = None) -> int:
             for package in itertools.chain(packages, new_packages):
                 f.write(f"{json.dumps(package)}\n")
 
-        subprocess.check_call(
-            (
-                sys.executable,
-                "-mdumb_pypi.main",
-                f"--previous-package-list-json={prev_json}",
-                f"--package-list-json={packages_json}",
-                f"--output-dir={args.dest}",
-                f'--packages-url={urllib.parse.urljoin(args.pypi_url, "wheels")}',
-                "--title=sentry pypi",
-                "--logo=https://avatars.githubusercontent.com/u/1396951?s=24",
-                "--logo-width=36",
-            )
-        )
+        pargs = [
+            sys.executable,
+            "-mdumb_pypi.main",
+            f"--package-list-json={packages_json}",
+            f"--output-dir={args.dest}",
+            f'--packages-url={urllib.parse.urljoin(args.pypi_url, "wheels")}',
+            "--title=sentry pypi",
+            "--logo=https://avatars.githubusercontent.com/u/1396951?s=24",
+            "--logo-width=36",
+        ]
+
+        if not args.rebuild:
+            pargs.append(f"--previous-package-list-json={prev_json}")
+
+        subprocess.check_call(pargs)
 
     # for now we don't utilize the json api
     shutil.rmtree(os.path.join(args.dest, "pypi"), ignore_errors=True)