Skip to content

Commit

Permalink
tests: package build
Browse files Browse the repository at this point in the history
Also update CI stuff so we use the same instructions.

Signed-off-by: Jérôme Jutteau <[email protected]>
  • Loading branch information
jerome-jutteau committed Jun 18, 2021
1 parent 37ddec9 commit ef84b17
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 19 deletions.
21 changes: 5 additions & 16 deletions .github/workflows/auto-build.yml
Original file line number Diff line number Diff line change
@@ -1,34 +1,23 @@
# This workflow will upload a Python Package using Twine when a release is created
# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries

name: Upload Python Package

on:
# Trigger the workflow on release
release:
types:
- created

jobs:
deploy:

runs-on: ubuntu-latest

runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: '3.x'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools wheel twine
pip install -r requirements.txt
- name: Build and publish
- name: Build package
run: make build
- name: Publish package
env:
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
run: |
python setup.py sdist bdist_wheel
twine upload dist/*
run: twine upload dist/*
9 changes: 7 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ all: help
.PHONY: help
help:
@echo "Available targets:"
@echo "- build: python package building"
@echo "- test: run all tests"
@echo "- test-pylint: check code with pylint"
@echo "- test-bandit: security check with bandit"
@echo "- clean: clean temp files, venv, etc"

.PHONY: test
test: clean test-pylint test-bandit
test: clean test-pylint test-bandit build
@echo "All tests OK"

.PHONY: test-pylint
Expand All @@ -20,9 +21,13 @@ test-pylint: .venv/ok
test-bandit: .venv/ok
@./tests/test_bandit.sh

.PHONY: build
build: .venv/ok
@./tests/build.sh

.venv/ok:
@./tests/setup_venv.sh

.PHONY: clean
clean:
rm -rf .venv
rm -rf .venv osc_sdk.egg-info dist
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[wheel]
[bdist_wheel]
universal = 1

[isort]
Expand Down
14 changes: 14 additions & 0 deletions tests/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/bin/bash
set -e

# Assuming you are running this from a prepared virtual environment
PROJECT_ROOT=$(cd "$(dirname $0)/.." && pwd)
cd $PROJECT_ROOT

echo -n "$(basename $0): "

. .venv/bin/activate > /dev/null
pip install setuptools wheel twine > /dev/null
python setup.py sdist bdist_wheel > /dev/null

echo "OK"

0 comments on commit ef84b17

Please sign in to comment.