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/.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 diff --git a/pyproject.toml b/pyproject.toml index 805942ad..5cf4fae9 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,13 @@ dynamic = ['version'] [tool.setuptools.dynamic] version = {attr = "meilisearch.version.__version__"} +[tool.setuptools.packages.find] +include = ["meilisearch*"] +exclude = ["docs*", "tests*"] + +[tool.setuptools.package-data] +meilisearch = ["py.typed"] + [project.urls] Meilisearch_Documentation = "https://docs.meilisearch.com/" Documentation = "https://meilisearch.github.io/meilisearch-python/" @@ -63,7 +71,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 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"]}, -)