From 179f3895001b9683be3496803cfaed1caa0e8c6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nico=20Schl=C3=B6mer?= Date: Mon, 28 Sep 2020 23:51:21 +0200 Subject: [PATCH 1/2] version bump --- Makefile | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9576de2..5be1cf9 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,11 @@ # This should best be read from setup.{py,cfg} -VERSION="0.3.0" +VERSION=0.3.3 default: @echo "\"make publish\"?" # https://packaging.python.org/distributing/#id72 -upload: setup.py +upload: clean # Make sure we're on the master branch @if [ "$(shell git rev-parse --abbrev-ref HEAD)" != "master" ]; then exit 1; fi rm -rf dist/* diff --git a/setup.py b/setup.py index 4a521df..9d44a03 100644 --- a/setup.py +++ b/setup.py @@ -91,7 +91,7 @@ def build_extensions(self): setup( name="accupy", - version="0.3.2", + version="0.3.3", packages=find_packages(), ext_modules=ext_modules, url="https://github.com/nschloe/accupy", From a9a4c0ce1a1d67131ae5b26ac533798bae5a2057 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nico=20Schl=C3=B6mer?= Date: Mon, 28 Sep 2020 23:51:41 +0200 Subject: [PATCH 2/2] new isort --- Makefile | 2 +- setup.py | 2 +- test/test_dot.py | 2 +- test/test_sums.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 5be1cf9..70e03ad 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ clean: @rm -rf *.egg-info/ build/ dist/ MANIFEST format: - isort -rc . + isort . black . black: diff --git a/setup.py b/setup.py index 9d44a03..48a0262 100644 --- a/setup.py +++ b/setup.py @@ -28,8 +28,8 @@ def has_flag(compiler, flagname): """Return a boolean indicating whether a flag name is supported on the specified compiler. """ - import tempfile import os + import tempfile with tempfile.NamedTemporaryFile("w", suffix=".cpp", delete=False) as f: f.write("int main (int argc, char **argv) { return 0; }") diff --git a/test/test_dot.py b/test/test_dot.py index 222053b..750ace0 100644 --- a/test/test_dot.py +++ b/test/test_dot.py @@ -1,9 +1,9 @@ import matplotlib.pyplot as plt import numpy +import perfplot import pytest import accupy -import perfplot @pytest.mark.parametrize("cond", [1.0, 1.0e15]) diff --git a/test/test_sums.py b/test/test_sums.py index c19dee4..b424c89 100644 --- a/test/test_sums.py +++ b/test/test_sums.py @@ -1,9 +1,9 @@ import matplotlib.pyplot as plt import numpy +import perfplot import pytest import accupy -import perfplot @pytest.mark.parametrize("cond", [1.0, 1.0e15])