From 921c3c3959f8549c5f91e8972ee9e1d45fc14f08 Mon Sep 17 00:00:00 2001
From: Malcolm Smith <smith@chaquo.com>
Date: Mon, 11 Mar 2024 14:29:09 +0000
Subject: [PATCH] Clarify format of build-wheel `--python` argument (closes
 #1109)

---
 server/pypi/README.md        |  3 ++-
 server/pypi/build-wheel.py   | 10 +++++++---
 server/pypi/requirements.txt |  1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/server/pypi/README.md b/server/pypi/README.md
index f141ca0d3c..e97643d3cb 100644
--- a/server/pypi/README.md
+++ b/server/pypi/README.md
@@ -70,7 +70,8 @@ Run build-wheel from this directory as follows:
 Where:
 
 * `X.Y` is the Python version you set up above.
-* `ABI` is an [Android ABI](https://developer.android.com/ndk/guides/abis).
+* `ABI` is an [Android
+  ABI](https://chaquo.com/chaquopy/doc/current/android.html#android-abis).
 * `PACKAGE` is a subdirectory of `packages` in this directory, or the path to another
   directory laid out in the same way (see "adding a package" below).
 
diff --git a/server/pypi/build-wheel.py b/server/pypi/build-wheel.py
index d055766664..726ad2b589 100755
--- a/server/pypi/build-wheel.py
+++ b/server/pypi/build-wheel.py
@@ -10,7 +10,6 @@
 import os
 from os.path import abspath, basename, dirname, exists, isdir, join, splitext
 from pathlib import Path
-import pkg_resources
 import re
 import shlex
 import subprocess
@@ -18,6 +17,7 @@
 import tempfile
 from textwrap import dedent
 import traceback
+import warnings
 
 import build
 from elftools.elf.elffile import ELFFile
@@ -26,6 +26,10 @@
 import pypi_simple
 import yaml
 
+with warnings.catch_warnings():
+    warnings.simplefilter("ignore", DeprecationWarning)
+    import pkg_resources
+
 
 PROGRAM_NAME = splitext(basename(__file__))[0]
 PYPI_DIR = abspath(dirname(__file__))
@@ -201,8 +205,8 @@ def parse_args(self):
                         help="Android ABI: choices=[%(choices)s]")
         ap.add_argument("--api-level", metavar="LEVEL", type=int, default=21,
                         help="Android API level: default=%(default)s")
-        ap.add_argument("--python", metavar="X.Y", help="Python version (required for "
-                        "Python packages)"),
+        ap.add_argument("--python", metavar="X.Y", help="Python major.minor version "
+                        "(required for Python packages)"),
         ap.add_argument("package", help=f"Name of a package in {RECIPES_DIR}, or if it "
                         f"contains a slash, path to a recipe directory")
         ap.parse_args(namespace=self)
diff --git a/server/pypi/requirements.txt b/server/pypi/requirements.txt
index 8f1709887d..5002a80c46 100644
--- a/server/pypi/requirements.txt
+++ b/server/pypi/requirements.txt
@@ -5,6 +5,7 @@ jsonschema==2.6.0
 pyelftools==0.29
 pypi-simple==1.1.0
 PyYAML==6.0
+setuptools==69.1.1
 tqdm==4.66.1
 wheel==0.33.6