Skip to content

Commit

Permalink
Merge pull request #2 from nschloe/modernize
Browse files Browse the repository at this point in the history
Modernize
  • Loading branch information
nschloe authored Jul 23, 2020
2 parents 8673e66 + 221d2aa commit cdfe8c0
Show file tree
Hide file tree
Showing 7 changed files with 685 additions and 34 deletions.
File renamed without changes.
11 changes: 6 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-python@v1
- uses: actions/setup-python@v2
with:
python-version: "3.x"
- uses: actions/checkout@v2
Expand All @@ -25,9 +25,9 @@ jobs:
matrix:
python-version: [3.6, 3.7, 3.8]
steps:
- uses: actions/setup-python@v1
- uses: actions/setup-python@v2
with:
python-version: "3.x"
python-version: ${{ matrix.python-version }}
- uses: actions/checkout@v2
with:
lfs: true
Expand All @@ -37,5 +37,6 @@ jobs:
run: |
pip install tox
tox
# - name: Submit to codecov
# run: bash <(curl -s https://codecov.io/bash)
- name: Submit to codecov
if: ${{ matrix.python-version == '3.8' }}
run: bash <(curl -s https://codecov.io/bash)
683 changes: 671 additions & 12 deletions LICENSE

Large diffs are not rendered by default.

14 changes: 4 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,15 @@ VERSION=$(shell python3 -c "from configparser import ConfigParser; p = ConfigPar
default:
@echo "\"make publish\"?"

# https://packaging.python.org/distributing/#id72
upload: setup.py
upload:
# Make sure we're on the master branch
@if [ "$(shell git rev-parse --abbrev-ref HEAD)" != "master" ]; then exit 1; fi
rm -f dist/*
python3 setup.py sdist
python3 setup.py bdist_wheel
python3 -m pep517.build --source --binary .
twine upload dist/*

tag:
@if [ "$(shell git rev-parse --abbrev-ref HEAD)" != "master" ]; then exit 1; fi
# @echo "Tagging v$(VERSION)..."
# git tag v$(VERSION)
# git push --tags
# Always create a github "release" right after tagging so it appears on zenodo
curl -H "Authorization: token `cat $(HOME)/.github-access-token`" -d '{"tag_name": "v$(VERSION)"}' https://api.github.com/repos/nschloe/specky/releases

publish: tag upload
Expand All @@ -27,10 +21,10 @@ clean:
@rm -rf *.egg-info/ build/ dist/ MANIFEST .pytest_cache/

format:
isort -rc .
isort .
black .

check:
isort --check -rc .
isort --check .
black --check .
flake8 .
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
</p>

[![gh-actions](https://img.shields.io/github/workflow/status/nschloe/specky/ci?style=flat-square)](https://github.com/nschloe/specky/actions?query=workflow%3Aci)
[![codecov](https://img.shields.io/codecov/c/github/nschloe/specky.svg?style=flat-square)](https://codecov.io/gh/nschloe/meshio)
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg?style=flat-square)](https://github.com/psf/black)
[![PyPI pyversions](https://img.shields.io/pypi/pyversions/specky.svg?style=flat-square)](https://pypi.org/pypi/specky/)
[![PyPi Version](https://img.shields.io/pypi/v/specky.svg?style=flat-square)](https://pypi.org/project/specky)
Expand Down
6 changes: 3 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = specky
version = 0.1.1
version = 0.1.2
author = Nico Schlömer
email = nico.schloemer@gmail.com
description = Audio file spectral analysis
Expand All @@ -10,8 +10,8 @@ project_urls =
Issues=https://github.com/nschloe/specky/issues
long_description = file: README.md
long_description_content_type = text/markdown
license = GPLv3+
platforms = any
license = GPL-3.0-or-later
license_file = LICENSE
classifiers =
Development Status :: 4 - Beta
Intended Audience :: Science/Research
Expand Down
4 changes: 0 additions & 4 deletions setup.py

This file was deleted.

0 comments on commit cdfe8c0

Please # to comment.