From 743e2849fec73725b13d3e64dacfcb516b2c2dc6 Mon Sep 17 00:00:00 2001
From: Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Date: Tue, 18 Jun 2019 22:11:08 -0700
Subject: [PATCH 1/2] Get rid of setup.py

pypa/setuptools#1675 made it optional, and was merged in v40.9.0.

Signed-off-by: Ellen Marie Dash <me@duckie.co>
---
 pyproject.toml | 4 +++-
 setup.py       | 6 ------
 2 files changed, 3 insertions(+), 7 deletions(-)
 delete mode 100755 setup.py

diff --git a/pyproject.toml b/pyproject.toml
index 681f239e..e48b1963 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,8 @@
 [build-system]
 # Specify the required build system.
-requires = ["setuptools", "wheel"]
+# Setuptools 40.9.0+ requirement is necessary to get rid of setup.py; see
+#  https://github.com/pypa/setuptools/pull/1675
+requires = ["setuptools >= 40.9.0", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [tool.bork.zipapp]
diff --git a/setup.py b/setup.py
deleted file mode 100755
index 06269e42..00000000
--- a/setup.py
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env python3
-
-from setuptools import setup
-
-# See setup.cfg for the actual configuration.
-setup()

From 9061ba19d17d14c8f690f6adb4b2b737ba837539 Mon Sep 17 00:00:00 2001
From: Ellen Marie Dash <me@duckie.co>
Date: Tue, 16 Jun 2020 15:19:21 -0400
Subject: [PATCH 2/2] [CI] Have FreeBSD install pip>=19.

---
 .cirrus.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.cirrus.yml b/.cirrus.yml
index 7ef085b4..c2155567 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -67,6 +67,7 @@ FreeBSD_task:
     - PY=`echo $PYTHON | tr -d '.'`
     - pkg install -y python${PY} py${PY}-setuptools
     - python${PYTHON} -m ensurepip
+    - python${PYTHON} -m pip install -U 'pip>=19' # Hard requirement for no setup.py.
     - python${PYTHON} -m pip install .[build]
     - python${PYTHON} -m pip install .[release] .[testing]
   script: