Merge branch 'tim/python' into 'master'

maint: Build ABI3 wheel with PyPA build + setuptools, not poetry

See merge request TankerHQ/sdk-python!282

Author: tux3

.gitignore

@@ -4,7 +4,6 @@ __pycache__
 *.so
 build/
 dist/
-setup.py
 .venv/
 .mypy_cache
 htmlcov/

.gitlab-ci.yml

@@ -94,7 +94,7 @@ check/deployed-native/linux:
     - .rules/deployed-native
   script:
     - poetry run python run-ci.py --isolate-conan-user-home prepare --use-tanker=deployed --profile linux-x86_64 --remote $CONAN_REMOTE --tanker-ref=$SDK_NATIVE_CONAN_REFERENCE
-    - poetry run python run-ci.py --isolate-conan-user-home build --test --profile linux-x86_64 --remote $CONAN_REMOTE --tanker-ref=$SDK_NATIVE_CONAN_REFERENCE
+    - poetry run python run-ci.py build --test
   tags: !reference [.tags/linux, tags]
 
 check/deployed-native/macos/x86_64:
@@ -104,7 +104,7 @@ check/deployed-native/macos/x86_64:
     - .rules/deployed-native
   script:
     - poetry run python run-ci.py --isolate-conan-user-home prepare --use-tanker=deployed --profile macos-x86_64 --remote $CONAN_REMOTE --tanker-ref=$SDK_NATIVE_CONAN_REFERENCE
-    - poetry run python run-ci.py --isolate-conan-user-home build --test --profile macos-x86_64 --remote $CONAN_REMOTE --tanker-ref=$SDK_NATIVE_CONAN_REFERENCE
+    - poetry run python run-ci.py build --test
   tags: !reference [.tags/macos/x86_64, tags]
 
 check/deployed-native/macos/arm:
@@ -114,7 +114,7 @@ check/deployed-native/macos/arm:
     - .rules/deployed-native
   script:
     - poetry run python run-ci.py --isolate-conan-user-home prepare --use-tanker=deployed --profile macos-armv8 --remote $CONAN_REMOTE --tanker-ref=$SDK_NATIVE_CONAN_REFERENCE
-    - poetry run python run-ci.py --isolate-conan-user-home build --test --profile macos-armv8 --remote $CONAN_REMOTE --tanker-ref=$SDK_NATIVE_CONAN_REFERENCE
+    - poetry run python run-ci.py build --test
   tags: !reference [.tags/macos/arm, tags]
 
 ## native from sources
@@ -126,7 +126,7 @@ check/native-from-sources/linux:
     - .rules/native-from-sources
   script:
     - poetry run python run-ci.py --isolate-conan-user-home prepare --remote $CONAN_REMOTE --use-tanker=same-as-branch --profile linux-x86_64
-    - poetry run python run-ci.py --isolate-conan-user-home build --test --profile linux-x86_64
+    - poetry run python run-ci.py build --test
   tags: !reference [.tags/compilation-linux, tags]
 
 check/native-from-sources/macos/x86_64:
@@ -136,7 +136,7 @@ check/native-from-sources/macos/x86_64:
     - .rules/native-from-sources
   script:
     - poetry run python run-ci.py --isolate-conan-user-home prepare --remote $CONAN_REMOTE --use-tanker=same-as-branch --profile macos-x86_64
-    - poetry run python run-ci.py --isolate-conan-user-home build --test --profile macos-x86_64
+    - poetry run python run-ci.py build --test
   tags: !reference [.tags/macos/x86_64, tags]
 
 check/native-from-sources/macos/arm:
@@ -146,7 +146,7 @@ check/native-from-sources/macos/arm:
     - .rules/native-from-sources
   script:
     - poetry run python run-ci.py --isolate-conan-user-home prepare --remote $CONAN_REMOTE --use-tanker=same-as-branch --profile macos-armv8
-    - poetry run python run-ci.py --isolate-conan-user-home build --test --profile macos-armv8
+    - poetry run python run-ci.py build --test
   tags: !reference [.tags/macos/arm, tags]
 
 ## downstream
@@ -158,7 +158,7 @@ check/downstream/linux:
     - .rules/check/downstream/linux
   script:
     - poetry run python run-ci.py --isolate-conan-user-home prepare --remote $CONAN_REMOTE --use-tanker=upstream --profile linux-x86_64
-    - poetry run python run-ci.py --isolate-conan-user-home build --test --profile linux-x86_64
+    - poetry run python run-ci.py build --test
   tags: !reference [.tags/linux, tags]
 
 check/downstream/macos/x86_64:
@@ -169,7 +169,7 @@ check/downstream/macos/x86_64:
   dependencies: []
   script:
     - poetry run python run-ci.py --isolate-conan-user-home prepare --remote $CONAN_REMOTE --use-tanker=upstream --profile macos-x86_64
-    - poetry run python run-ci.py --isolate-conan-user-home build --test --profile macos-x86_64
+    - poetry run python run-ci.py build --test
   tags: !reference [.tags/macos/x86_64, tags]
 
 check/downstream/macos/arm:
@@ -180,7 +180,7 @@ check/downstream/macos/arm:
   dependencies: []
   script:
     - poetry run python run-ci.py --isolate-conan-user-home prepare --remote $CONAN_REMOTE --use-tanker=upstream --profile macos-armv8
-    - poetry run python run-ci.py --isolate-conan-user-home build --test --profile macos-armv8
+    - poetry run python run-ci.py build --test
   tags: !reference [.tags/macos/arm, tags]
 
 .safety:
@@ -223,7 +223,7 @@ safety/manual:
     - .rules/build-wheel
   script:
     - poetry run python run-ci.py --isolate-conan-user-home prepare --remote $CONAN_REMOTE --use-tanker=deployed --tanker-ref $SDK_NATIVE_CONAN_REFERENCE --profile $CONAN_PROFILE
-    - poetry run python run-ci.py --isolate-conan-user-home build --profile $CONAN_PROFILE --release $SDK_PYTHON_RELEASE_VERSION --remote $CONAN_REMOTE --tanker-ref $SDK_NATIVE_CONAN_REFERENCE
+    - poetry run python run-ci.py --isolate-conan-user-home build --release $SDK_PYTHON_RELEASE_VERSION
   artifacts:
     paths:
       - dist

MANIFEST.in

@@ -0,0 +1,5 @@
+include build_tanker.py
+include cffi_src.c
+include cffi_defs.h
+include exported_symbols.*
+graft conan

build.py

@@ -0,0 +1,4 @@
+raise Exception(
+    "Don't use `poetry build`, it can't build abi stable wheels. "
+    "Use `poetry run python -m build -w` instead."
+)

poetry.lock

@@ -1,18 +1,15 @@
+[project]
+name = "tankersdk"
+version = "0.0.0"
+description = "Python client fo Tanker"
+authors = [{ name = "Tanker team" }]
+
 [tool.poetry]
 name = "tankersdk"
 version = "0.0.0"
 description = "Python client fo Tanker"
 authors = ["Tanker team"]
 
-include = [
-  "build_tanker.py",
-  "build.py",
-  "cffi_defs.h",
-  "cffi_src.c",
-]
-
-
-
 [tool.poetry.dependencies]
 python = "^3.11"
 cffi = "^1.13.2"
@@ -45,14 +42,19 @@ tankeradminsdk = { version = "^3.0.0", source = "gitlab" }
 tankersdk-identity = "3.3.0"
 
 [tool.poetry.build]
-generate-setup-file = true
-script = "build.py"
+script = "poetry_do_not_build.py"
 
 [[tool.poetry.source]]
 name = "gitlab"
 url = "https://gitlab.com/api/v4/projects/20917546/packages/pypi/simple"
 secondary = true
 
+[tool.setuptools]
+packages = ["tankersdk"]
+
+[tool.distutils.bdist_wheel]
+py-limited-api = "cp39"
+
 [build-system]
-requires = ["poetry-core>=1.0.0", "setuptools", "wheel", "cffi >= 1.12", "path"]
-build-backend = "poetry.core.masonry.api"
+requires = ["poetry-core>=1.0.0", "path", "setuptools>=61", "cffi >= 1.12", "build >= 0.10.0"]
+build-backend = "setuptools.build_meta"

poetry_do_not_build.py

@@ -52,7 +52,7 @@ def prepare(
     )
 
 
-def build_wheel(profile: Profile, version: str, tanker_ref: str) -> None:
+def build_wheel(version: str) -> None:
     src_path = Path.cwd()
     tankerci.bump.bump_files(version)
     dist_path = src_path / "dist"
@@ -69,7 +69,7 @@ def build_wheel(profile: Profile, version: str, tanker_ref: str) -> None:
     # so that they can be found even when the working directory
     # changes, and we make sure *all* paths used in build_tanker.py
     # are absolute
-    tankerci.run("poetry", "build", env=env)
+    tankerci.run("poetry", "run", "python", "-m", "build", "--wheel", env=env)
     wheels = list(dist_path.glob("tankersdk-*.whl"))
     if len(wheels) != 1:
         raise Exception("multiple wheels found: {}".format(wheels))
@@ -98,12 +98,14 @@ def run_test() -> None:
     shutil.copytree(coverage_dir, dest_dir)
 
 
-def build(
-    profile: Profile, release_version: Optional[str], tanker_ref: str, test: bool
-) -> None:
+def build(release_version: Optional[str], test: bool) -> None:
+    # Installs the dependencies (and the pure-python part of the package, without the C extension)
     tankerci.run("poetry", "install", cwd=Path.cwd())
+    # Builds a local version of the package (a wheel) and installs it inside the poetry virtualenv
+    tankerci.run("poetry", "run", "pip", "install", ".", cwd=Path.cwd())
+
     if release_version:
-        build_wheel(profile, release_version, tanker_ref)
+        build_wheel(release_version)
     if test:
         run_test()
 
@@ -139,11 +141,8 @@ def main() -> None:
     subparsers = parser.add_subparsers(title="subcommands", dest="command")
 
     build_parser = subparsers.add_parser("build")
-    build_parser.add_argument("--profile", default="default", nargs="+")
-    build_parser.add_argument("--tanker-ref")
     build_parser.add_argument("--test", action="store_true")
     build_parser.add_argument("--release")
-    build_parser.add_argument("--remote", default="artifactory")
 
     prepare_parser = subparsers.add_parser("prepare")
     prepare_parser.add_argument(
@@ -183,8 +182,7 @@ def main() -> None:
             tankerci.conan.run("remove", "tanker/*", "--force")
 
     if command == "build":
-        with tankerci.conan.ConanContextManager([args.remote], conan_home=user_home):
-            build(Profile(args.profile), args.release, args.tanker_ref, args.test)
+        build(args.release, args.test)
     elif command == "prepare":
         with tankerci.conan.ConanContextManager([args.remote], conan_home=user_home):
             prepare(

pyproject.toml

@@ -0,0 +1,5 @@
+from setuptools import setup
+
+setup(
+    cffi_modules="build_tanker.py:tanker_ext",
+)