Skip to content

Commit

Permalink
Use pyproject.toml instead of setup.py (#39)
Browse files Browse the repository at this point in the history
  • Loading branch information
PeterLombaers authored Mar 29, 2024
1 parent 3a01d45 commit 9937d11
Show file tree
Hide file tree
Showing 17 changed files with 158 additions and 2,580 deletions.
16 changes: 16 additions & 0 deletions .github/workflows/ci-workflow.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
name: test-suite
on: [push, pull_request]
jobs:
lint-python:
name: lint-python
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.11'
architecture: 'x64'
- name: Install ruff
run: |
pip install ruff
- name: Lint python with ruff
run: |
ruff check .
test-master:
name: pytest
runs-on: ubuntu-latest
Expand All @@ -9,6 +24,7 @@ jobs:
- uses: actions/setup-python@v5
- name: Install packages and run tests
run: |
python3 -m pip install pip -U
pip install pytest
pip install .
pytest
78 changes: 22 additions & 56 deletions .github/workflows/pythonpublish.yml
Original file line number Diff line number Diff line change
@@ -1,63 +1,29 @@
name: Deploy and release
name: Upload Python Package

on:
push:
tags:
- 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
release:
types: [published]

permissions:
contents: read

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v1
with:
python-version: '3.x'
- name: Get the version (git tag)
id: get_version
run: |
echo ${GITHUB_REF/refs\/tags\/v/}
echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\/v/}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools wheel
- name: Build
run: |
python setup.py sdist bdist_wheel
- name: Create Release
id: create_release
uses: actions/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ github.ref }}
release_name: Release ${{ github.ref }}
draft: false
prerelease: false
- name: Upload Release Asset (Wheel)
id: upload-release-asset-whl
uses: actions/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./dist/asreview_datatools-${{ steps.get_version.outputs.VERSION }}-py3-none-any.whl
asset_name: asreview_datatools-${{ steps.get_version.outputs.VERSION }}-py3-none-any.whl
asset_content_type: application/x-wheel+zip
- name: Upload Release Asset (Sdist)
id: upload-release-asset-sdist
uses: actions/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./dist/asreview-datatools-${{ steps.get_version.outputs.VERSION }}.tar.gz
asset_name: asreview-datatools-${{ steps.get_version.outputs.VERSION }}.tar.gz
asset_content_type: application/zip
- name: Publish package
uses: pypa/gh-action-pypi-publish@master
with:
user: __token__
password: ${{ secrets.pypi_password }}
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: "3.x"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install build
- name: Build package
run: python -m build
- name: Publish package
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.pypi_password }}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -127,3 +127,5 @@ dmypy.json

# Pyre type checker
.pyre/

asreviewcontrib/datatools/_version.py
2 changes: 0 additions & 2 deletions MANIFEST.in

This file was deleted.

10 changes: 6 additions & 4 deletions asreviewcontrib/datatools/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
from ._version import get_versions

__version__ = get_versions()["version"]
del get_versions
try:
from asreviewcontrib.datatools._version import __version__
from asreviewcontrib.datatools._version import __version_tuple__
except ImportError:
__version__ = "0.0.0"
__version_tuple__ = (0, 0, 0)
Loading

0 comments on commit 9937d11

Please sign in to comment.