Merge branch 'master' of https://git.cpi.imtek.uni-freiburg.de/holgi/ordr3

5 years ago · 6137329194
4 changed files with 9 additions and 4 deletions
--- a/4
+++ b/4
@ -51,8 +51,8 @@ clean-test: ## remove test and coverage artifacts
				@@ -51,8 +51,8 @@ clean-test: ## remove test and coverage artifacts
 	rm -fr htmlcov/

 lint: ## reformat with black and check style with flake8
-	isort -rc ordr3
-	isort -rc tests
+	isort ordr3
+	isort tests
 	black ordr3 tests
 	flake8 ordr3 tests

--- a/ordr3/init.py
+++ b/ordr3/init.py
@ -3,7 +3,7 @@
				@@ -3,7 +3,7 @@
 A rewrite of our CPI ordering system.
 """

-__version__ = "0.0.1"
+__version__ = "1.0.0"


 from pyramid.config import Configurator
--- a/ordr3/scripts/migrate_to_0.1.0.sh
+++ b/ordr3/scripts/migrate_to_0.1.0.sh
@ -0,0 +1,5 @@
				@@ -0,0 +1,5 @@
+cp ordr3.sqlite pre-0.1.0-ordr3.sqlite
+echo .dump orders | sqlite3 ordr3.sqlite > tmp_modify.sqlite
+vim tmp_modify.sqlite
+echo drop table orders | sqlite3 ordr3.sqlite
+sqlite3 ordr3.sqlite < tmp_modify.sqlite
--- a/pyproject.toml
+++ b/pyproject.toml
@ -52,7 +52,7 @@ dev = [
				@@ -52,7 +52,7 @@ dev = [
    "black",
    "flake8",
    "flake8-comprehensions",
-    "isort",
+    "isort >= 5.0.0",
    "keyring",
    "pre-commit",
 ]