Skip to content

Commit

Permalink
Replace setup.py with pyproject.toml (#53)
Browse files Browse the repository at this point in the history
  • Loading branch information
J535D165 authored Jun 11, 2023
1 parent 6e1c471 commit 152f000
Show file tree
Hide file tree
Showing 12 changed files with 95 additions and 2,584 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ jobs:
with:
python-version: '3.8'
architecture: 'x64'
- name: Install flake8
- name: Install ruff
run: |
pip install flake8
- name: Lint python with flake8
pip install ruff
- name: Lint python with ruff
run: |
flake8 . --max-complexity=10 --statistics
ruff .
test-asreview:
name: Test Insights for ASReview LAB versions
runs-on: ubuntu-latest
Expand Down
60 changes: 14 additions & 46 deletions .github/workflows/pythonpublish.yml
Original file line number Diff line number Diff line change
@@ -1,63 +1,31 @@
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
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v1
uses: actions/setup-python@v3
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_insights-${{ steps.get_version.outputs.VERSION }}-py3-none-any.whl
asset_name: asreview_insights-${{ 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-insights-${{ steps.get_version.outputs.VERSION }}.tar.gz
asset_name: asreview-insights-${{ steps.get_version.outputs.VERSION }}.tar.gz
asset_content_type: application/zip
pip install build
- name: Build package
run: python -m build
- name: Publish package
uses: pypa/gh-action-pypi-publish@master
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.pypi_password }}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

tests/*.h5
asreviewcontrib/insights/_version.py

# Created by https://www.gitignore.io/api/python
# Edit at https://www.gitignore.io/?templates=python
Expand Down
2 changes: 0 additions & 2 deletions MANIFEST.in

This file was deleted.

9 changes: 6 additions & 3 deletions asreviewcontrib/insights/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@
from asreviewcontrib.insights.plot import plot_recall
from asreviewcontrib.insights.plot import plot_wss

from ._version import get_versions
try:
from asreviewcontrib.insights._version import __version__
from asreviewcontrib.insights._version import __version_tuple__
except ImportError:
__version__ = "0.0.0"
__version_tuple__ = (0, 0, 0)

__version__ = get_versions()["version"]
del get_versions

__all__ = ["plot_recall", "plot_wss", "plot_erf", "erf", "recall", "wss"]
Loading

0 comments on commit 152f000

Please sign in to comment.