From c94736fd32132fb87d9a63228f60d7862c29d1e8 Mon Sep 17 00:00:00 2001
From: Paul Sanders <psanders1@gmail.com>
Date: Thu, 9 Mar 2023 08:41:44 -0500
Subject: [PATCH 1/4] Fix package build

---
 .github/workflows/pypi-publish.yml | 4 ++--
 pyproject.toml                     | 7 +++++++
 setup.py                           | 9 ---------
 3 files changed, 9 insertions(+), 11 deletions(-)
 delete mode 100644 setup.py

diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml
index 72da6985..538b4b73 100644
--- a/.github/workflows/pypi-publish.yml
+++ b/.github/workflows/pypi-publish.yml
@@ -21,11 +21,11 @@ jobs:
     - name: Install dependencies
       run: |
         pipenv install
-        pipenv run pip3 install setuptools wheel twine
+        pipenv run pip3 install build setuptools wheel twine
     - name: Build and publish
       env:
         TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
         TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
       run: |
-        pipenv run python3 setup.py sdist bdist_wheel
+        pipenv run python3 -m build
         pipenv run twine upload dist/*
diff --git a/pyproject.toml b/pyproject.toml
index 805942ad..656ae171 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,6 @@
 [build-system]
 requires = ["setuptools", "wheel"]
+build-backend = "setuptools.build_meta"
 
 [project]
 name = "meilisearch"
@@ -33,6 +34,12 @@ dynamic = ['version']
 [tool.setuptools.dynamic]
 version = {attr = "meilisearch.version.__version__"}
 
+[tool.setuptools]
+packages=["meilisearch"]
+
+[tool.setuptools.package-data]
+meilisearch = ["py.typed"]
+
 [project.urls]
 Meilisearch_Documentation = "https://docs.meilisearch.com/"
 Documentation = "https://meilisearch.github.io/meilisearch-python/"
diff --git a/setup.py b/setup.py
deleted file mode 100644
index f403f610..00000000
--- a/setup.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from setuptools import find_packages, setup
-
-from meilisearch.version import __version__
-
-setup(
-    packages=find_packages(exclude=("tests*",)),
-    include_package_data=True,
-    package_data={"meilisearch": ["py.typed"]},
-)

From bc4ca55d2dcaf29316debe771cf3f518a31ad998 Mon Sep 17 00:00:00 2001
From: Paul Sanders <psanders1@gmail.com>
Date: Thu, 9 Mar 2023 08:49:41 -0500
Subject: [PATCH 2/4] Remove setup.py from black check

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 656ae171..c43faa14 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -70,7 +70,7 @@ extend-exclude = '''
 [tool.isort]
 profile = "black"
 line_length = 100
-src_paths = ["meilisearch", "tests", "setup.py"]
+src_paths = ["meilisearch", "tests"]
 
 [tool.mypy]
 disallow_untyped_defs = true

From 5c473a54b8716637d89809021730395670648314 Mon Sep 17 00:00:00 2001
From: Paul Sanders <psanders1@gmail.com>
Date: Thu, 9 Mar 2023 08:53:16 -0500
Subject: [PATCH 3/4] Remove reference to setup.py from black CI check

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 8cfbdbb1..ee0591ef 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -81,7 +81,7 @@ jobs:
       - name: Install dependencies
         run: pipenv install --dev --python=${{ matrix.python-version }}
       - name: black
-        run: pipenv run black meilisearch tests setup.py --check
+        run: pipenv run black meilisearch tests --check
 
   isort:
     name: isort

From a654d8395a0531d0880a3093f21c155220ce03fa Mon Sep 17 00:00:00 2001
From: Paul Sanders <psanders1@gmail.com>
Date: Thu, 9 Mar 2023 12:21:52 -0500
Subject: [PATCH 4/4] Switch to packages.find

---
 pyproject.toml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index c43faa14..5cf4fae9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -34,8 +34,9 @@ dynamic = ['version']
 [tool.setuptools.dynamic]
 version = {attr = "meilisearch.version.__version__"}
 
-[tool.setuptools]
-packages=["meilisearch"]
+[tool.setuptools.packages.find]
+include = ["meilisearch*"]
+exclude = ["docs*", "tests*"]
 
 [tool.setuptools.package-data]
 meilisearch = ["py.typed"]