Skip to content

Commit

Permalink
Merge pull request #96 from nschloe/coverage
Browse files Browse the repository at this point in the history
some small updates
  • Loading branch information
nschloe authored Feb 10, 2021
2 parents 213be8b + 37f9c8f commit 4a54cae
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 359 deletions.
13 changes: 9 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
name: ci

on: [pull_request]
on:
push:
branches:
- main
pull_request:
branches:
- main

jobs:
lint:
Expand Down Expand Up @@ -35,7 +41,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.6, 3.7, 3.8]
python-version: [3.6, 3.7, 3.8, 3.9]
steps:
- uses: actions/setup-python@v2
with:
Expand All @@ -45,6 +51,5 @@ jobs:
run: |
pip install tox
tox
- name: Submit to codecov
- uses: codecov/codecov-action@v1
if: ${{ matrix.python-version == '3.8' }}
run: bash <(curl -s https://codecov.io/bash)
11 changes: 6 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ default:
@echo "\"make publish\"?"

tag:
@if [ "$(shell git rev-parse --abbrev-ref HEAD)" != "master" ]; then exit 1; fi
@if [ "$(shell git rev-parse --abbrev-ref HEAD)" != "main" ]; then exit 1; fi
curl -H "Authorization: token `cat $(HOME)/.github-access-token`" -d '{"tag_name": "v$(VERSION)"}' https://api.github.com/repos/nschloe/tuna/releases

upload: clean
# Make sure we're on the master branch
@if [ "$(shell git rev-parse --abbrev-ref HEAD)" != "master" ]; then exit 1; fi
# Make sure we're on the main branch
@if [ "$(shell git rev-parse --abbrev-ref HEAD)" != "main" ]; then exit 1; fi
# https://stackoverflow.com/a/58756491/353337
python3 -m build --sdist --wheel .
twine upload dist/*
Expand All @@ -20,8 +20,8 @@ upload: clean

dep:
npm install
cp -r node_modules/bootstrap/dist/css/bootstrap.min.css tuna/web/static/
cp -r node_modules/d3/dist/d3.min.js tuna/web/static/
cp node_modules/bootstrap/dist/css/bootstrap.min.css tuna/web/static/
cp node_modules/d3/dist/d3.min.js tuna/web/static/

update:
npm update
Expand All @@ -37,6 +37,7 @@ clean:
lint:
flake8 .
black --check .
blacken-docs README.md
eslint tuna/web/static/icicle.js
htmlhint tuna/web/index.html

Expand Down
Loading

0 comments on commit 4a54cae

Please sign in to comment.