do not use legacy setup.py

rlehfeld · Mar 20, 2023 · 65f7d85 · 65f7d85
1 parent f596550
commit 65f7d85
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install flake8 flake8-polyfill robotframework
+          pip install -U flake8 flake8-polyfill robotframework
       - name: Analysing the code with flake8
         run: |
           flake8 $(git ls-files '*.py')
@@ -38,7 +38,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install setuptools_scm pylint robotframework
+          pip install -U setuptools_scm setuptools pylint robotframework
       - name: Analysing the code with pylint
         run: |
           pylint $(git ls-files '*.py')
@@ -59,11 +59,11 @@ jobs:
       - name: Upgrade pip
         run: |
           python -m pip install --upgrade pip
-          pip install setuptools_scm
+          pip install -U setuptools_scm setuptools
       - name: Install robotframework latest
         if: ${{ matrix.robotframework-version == 'latest' }}
         run: |
-          pip install robotframework
+          pip install -U robotframework
       - name: Install robotframework ${{ matrix.robotframework-version }}
         if: ${{ matrix.robotframework-version != 'latest' }}
         run: |

diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml
@@ -26,11 +26,11 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install setuptools_scm wheel twine
+        pip install -U setuptools_scm setuptools wheel build twine
     - name: Build and publish
       env:
         TWINE_USERNAME: ${{ secrets.PYPI_API_USERNAME }}
         TWINE_PASSWORD: ${{ secrets.PYPI_API_PASSWORD }}
       run: |
-        python setup.py sdist bdist_wheel
+        python -m build .
         twine upload dist/*
diff --git a/MIT-LICENSE.txt → LICENSE.txt b/MIT-LICENSE.txt → LICENSE.txt
diff --git a/pyproject.toml b/pyproject.toml
@@ -8,10 +8,10 @@ authors = [
 ]
 description = 'Generic Robot Framework library for asynchronous keyword execution'
 requires-python = '>=3.7'
+license = {file = 'LICENSE.txt'}
 keywords = ['async', 'robotframework']
 classifiers = [
     'Programming Language :: Python :: 3',
-    'License :: OSI Approved :: MIT License',
     'Environment :: Other Environment',
     'Intended Audience :: Developers',
     'Operating System :: OS Independent',
@@ -24,7 +24,8 @@ dynamic = ['version', 'readme']
 
 [project.urls]
 'Homepage' = 'https://github.com/rlehfeld/robotframework-async-keyword'
-'Bug Tracker' = 'https://github.com/rlehfeld/robotframework-async-keyword/issues'
+'Bug Reports' = 'https://github.com/rlehfeld/robotframework-async-keyword/issues'
+'Source' = 'https://github.com/rlehfeld/robotframework-async-keyword/'
 
 [tool.setuptools]
 packages = ['AsyncLibrary']