Merge pull request #7 from nschloe/modern

Modernization

.github/workflows/ci.yml

@@ -1,6 +1,12 @@
 name: ci
 
-on: [pull_request]
+on:
+  push:
+    branches:
+    - main
+  pull_request:
+    branches:
+    - main
 
 jobs:
   lint:
@@ -23,7 +29,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:
@@ -37,6 +43,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)

Makefile

@@ -3,15 +3,14 @@ VERSION=$(shell python3 -c "from configparser import ConfigParser; p = ConfigPar
 default:
 	@echo "\"make publish\"?"
 
-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/*
+upload: clean
+	# Make sure we're on the main branch
+	@if [ "$(shell git rev-parse --abbrev-ref HEAD)" != "main" ]; then exit 1; fi
 	python3 -m build --sdist --wheel .
 	twine upload dist/*
 
 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/specky/releases
 
 publish: tag upload

setup.cfg

@@ -1,13 +1,14 @@
 [metadata]
 name = specky
-version = 0.1.4
+version = 0.1.5
 author = Nico Schlömer
 author_email = nico.schloemer@gmail.com
 description = Audio file spectral analysis
 url = https://github.com/nschloe/specky
 project_urls =
     Code=https://github.com/nschloe/specky
     Issues=https://github.com/nschloe/specky/issues
+    Funding=https://github.com/sponsors/nschloe
 long_description = file: README.md
 long_description_content_type = text/markdown
 license = GPL-3.0-or-later
@@ -21,6 +22,7 @@ classifiers =
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
     Topic :: Scientific/Engineering
     Topic :: Utilities
 
@@ -35,9 +37,6 @@ install_requires =
     pydub
     scipy
 python_requires = >=3.6
-setup_requires =
-    setuptools>=42
-    wheel
 
 [options.extras_require]
 all = matplotlib