From ccbfe9797ece6f8f0b0e9bd9c982e5dd7c55cc2f Mon Sep 17 00:00:00 2001 From: Felix Dangel <48687646+f-dangel@users.noreply.github.com> Date: Mon, 24 Jun 2024 10:53:09 -0400 Subject: [PATCH] [REF] Deprecate `pkg_resources` in setup (#77) * [DOC] Update changelog, prepare `v0.0.3` release * [FIX] Use PyPI token for upload * [REF] Replace `pkg_resources` with `distutils` and `importlib` * [REF] Enable verbose output of `twine` * [REF] Use trusted publisher from PyPI --- .github/workflows/python-publish.yaml | 5 +---- setup.py | 14 +++++++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/python-publish.yaml b/.github/workflows/python-publish.yaml index 0b1c973..903a980 100644 --- a/.github/workflows/python-publish.yaml +++ b/.github/workflows/python-publish.yaml @@ -22,9 +22,6 @@ jobs: python -m pip install --upgrade pip pip install setuptools wheel twine - name: Build and publish - env: - TWINE_USERNAME: __token__ - TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} run: | python setup.py sdist bdist_wheel - twine upload dist/* + twine upload --verbose dist/* diff --git a/setup.py b/setup.py index 82a9b3e..603f9c2 100644 --- a/setup.py +++ b/setup.py @@ -4,16 +4,20 @@ """ import sys +from distutils.version import LooseVersion +from importlib.metadata import PackageNotFoundError, version -from pkg_resources import VersionConflict, require from setuptools import setup try: - require("setuptools>=38.3") -except VersionConflict: - print("Error: version of setuptools is too old (<38.3)!") + setuptools_version = LooseVersion(version("setuptools")) + required_version = LooseVersion("38.3") + if setuptools_version < required_version: + print("Error: version of setuptools is too old (<38.3)!") + sys.exit(1) +except PackageNotFoundError: + print("setuptools not found") sys.exit(1) - if __name__ == "__main__": setup(use_scm_version=True)