From 121ada4a0386f9f7c818abda205f33060683d9d8 Mon Sep 17 00:00:00 2001 From: JensDiemer Date: Mon, 22 Nov 2021 19:57:05 +0100 Subject: [PATCH] Release as v0.12.0 --- README.creole | 5 ++++- README.rst | 10 ++++++++-- deployment/project.env | 2 +- pyproject.toml | 2 +- src/inventory/__init__.py | 2 +- .../test_admin_item_auto_group_items_1.snapshot.html | 4 ++-- .../test_admin_item_auto_group_items_2.snapshot.html | 4 ++-- ...tem_normal_user_create_minimal_item_1.snapshot.html | 4 ++-- ...tem_normal_user_create_minimal_item_2.snapshot.html | 4 ++-- ...emo_normal_user_create_minimal_item_1.snapshot.html | 4 ++-- 10 files changed, 25 insertions(+), 16 deletions(-) diff --git a/README.creole b/README.creole index f35b498..3742c9f 100644 --- a/README.creole +++ b/README.creole @@ -171,8 +171,11 @@ Files are separated into: "/src/" and "/development/" == history -* [[https://github.com/jedie/PyInventory/compare/v0.11.0...master|compare v0.11.0...master]] **dev** +* [[https://github.com/jedie/PyInventory/compare/v0.12.0...master|compare v0.12.0...master]] **dev** ** tbc +* [[https://github.com/jedie/PyInventory/compare/v0.11.0...v0.12.0|v0.12.0 - 22.11.2021]] +** NEW: [[https://github.com/jedie/PyInventory/pull/78|Protect user to overwrite newer Item/Memo/Location with a older one (e.g.: in other browser TAB)]] +** update requirements * [[https://github.com/jedie/PyInventory/compare/v0.10.1...v0.11.0|v0.11.0 - 09.10.2021]] ** NEW: Memo model/admin: Store Information (incl. images/files/links) independent of items/locations ** Bugfix CKEditor sizes and fix toolbar (e.g.: remove useless pdf generator button and add sourcecode function) diff --git a/README.rst b/README.rst index 1aef5d0..0ad7d4c 100644 --- a/README.rst +++ b/README.rst @@ -237,10 +237,16 @@ Files are separated into: "/src/" and "/development/" history ------- -* `compare v0.11.0...master `_ **dev** +* `compare v0.12.0...master `_ **dev** * tbc +* `v0.12.0 - 22.11.2021 `_ + + * NEW: `Protect user to overwrite newer Item/Memo/Location with a older one (e.g.: in other browser TAB) `_ + + * update requirements + * `v0.11.0 - 09.10.2021 `_ * NEW: Memo model/admin: Store Information (incl. images/files/links) independent of items/locations @@ -436,4 +442,4 @@ donation ------------ -``Note: this file is generated from README.creole 2021-10-09 20:31:12 with "python-creole"`` \ No newline at end of file +``Note: this file is generated from README.creole 2021-11-22 19:55:39 with "python-creole"`` \ No newline at end of file diff --git a/deployment/project.env b/deployment/project.env index 04060ff..578439f 100644 --- a/deployment/project.env +++ b/deployment/project.env @@ -1,3 +1,3 @@ export PROJECT_NAME=pyinventory export PROJECT_PACKAGE_NAME=pyinventory -export PROJECT_VERSION=0.12.0.rc1 +export PROJECT_VERSION=0.12.0 diff --git a/pyproject.toml b/pyproject.toml index f91c23e..e1af555 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "PyInventory" -version = "0.12.0.rc1" +version = "0.12.0" description = "Web based management to catalog things including state and location etc. using Python/Django." authors = ["JensDiemer "] homepage = "https://github.com/jedie/PyInventory" diff --git a/src/inventory/__init__.py b/src/inventory/__init__.py index 32e3bdd..5761fb9 100644 --- a/src/inventory/__init__.py +++ b/src/inventory/__init__.py @@ -4,4 +4,4 @@ :license: GNU GPL v3 or above, see LICENSE for more details. """ -__version__ = "0.12.0.rc1" +__version__ = "0.12.0" diff --git a/src/inventory_project/tests/test_admin_item_auto_group_items_1.snapshot.html b/src/inventory_project/tests/test_admin_item_auto_group_items_1.snapshot.html index b891466..8be881a 100644 --- a/src/inventory_project/tests/test_admin_item_auto_group_items_1.snapshot.html +++ b/src/inventory_project/tests/test_admin_item_auto_group_items_1.snapshot.html @@ -2,7 +2,7 @@ - Select Item to change | PyInventory v0.12.0.rc1 + Select Item to change | PyInventory v0.12.0 @@ -43,7 +43,7 @@ diff --git a/src/inventory_project/tests/test_admin_item_auto_group_items_2.snapshot.html b/src/inventory_project/tests/test_admin_item_auto_group_items_2.snapshot.html index 7090e2a..086cba9 100644 --- a/src/inventory_project/tests/test_admin_item_auto_group_items_2.snapshot.html +++ b/src/inventory_project/tests/test_admin_item_auto_group_items_2.snapshot.html @@ -2,7 +2,7 @@ - Select Item to change | PyInventory v0.12.0.rc1 + Select Item to change | PyInventory v0.12.0 @@ -43,7 +43,7 @@ diff --git a/src/inventory_project/tests/test_admin_item_normal_user_create_minimal_item_1.snapshot.html b/src/inventory_project/tests/test_admin_item_normal_user_create_minimal_item_1.snapshot.html index 4c83d9c..c070a5e 100644 --- a/src/inventory_project/tests/test_admin_item_normal_user_create_minimal_item_1.snapshot.html +++ b/src/inventory_project/tests/test_admin_item_normal_user_create_minimal_item_1.snapshot.html @@ -2,7 +2,7 @@ - Add Item | PyInventory v0.12.0.rc1 + Add Item | PyInventory v0.12.0 @@ -84,7 +84,7 @@ diff --git a/src/inventory_project/tests/test_admin_item_normal_user_create_minimal_item_2.snapshot.html b/src/inventory_project/tests/test_admin_item_normal_user_create_minimal_item_2.snapshot.html index 419d5b6..b589991 100644 --- a/src/inventory_project/tests/test_admin_item_normal_user_create_minimal_item_2.snapshot.html +++ b/src/inventory_project/tests/test_admin_item_normal_user_create_minimal_item_2.snapshot.html @@ -2,7 +2,7 @@ - Change Item | PyInventory v0.12.0.rc1 + Change Item | PyInventory v0.12.0 @@ -84,7 +84,7 @@ diff --git a/src/inventory_project/tests/test_admin_memo_normal_user_create_minimal_item_1.snapshot.html b/src/inventory_project/tests/test_admin_memo_normal_user_create_minimal_item_1.snapshot.html index a5d0260..f8edc45 100644 --- a/src/inventory_project/tests/test_admin_memo_normal_user_create_minimal_item_1.snapshot.html +++ b/src/inventory_project/tests/test_admin_memo_normal_user_create_minimal_item_1.snapshot.html @@ -2,7 +2,7 @@ - Add Memo | PyInventory v0.12.0.rc1 + Add Memo | PyInventory v0.12.0 @@ -80,7 +80,7 @@