From fee696d509be00e8acce48f5f7a5aad01c69edf6 Mon Sep 17 00:00:00 2001 From: JensDiemer Date: Mon, 23 Nov 2020 17:45:37 +0100 Subject: [PATCH] Release as v0.7.0 --- README.creole | 27 +++++++++++++++++++++++++- README.rst | 40 +++++++++++++++++++++++++++++++++++++-- poetry.lock | 14 +++++++------- pyproject.toml | 2 +- src/inventory/__init__.py | 2 +- 5 files changed, 73 insertions(+), 12 deletions(-) diff --git a/README.creole b/README.creole index 22cdef9..b71bc1c 100644 --- a/README.creole +++ b/README.creole @@ -160,6 +160,24 @@ e.g.: == Backwards-incompatible changes +=== v0.7.0 + +Docker-Compose usage: The MEDIA files was not stored on a docker volumes. + +You should backup rhe media files **before** update the containers! + +e.g.: +{{{ +~/PyInventory/deployment$ make shell_inventory +root@inventory:/django# cp -Rfv /media/ /django_volumes/media/ +}}} +The files are stored locally here: +{{{ +~/PyInventory/deployment$ ls -la volumes/django/media/ +}}} +Now, update the containers and copy the files back. + + === v0.5.0 Git branches "master" and "deployment" was merged into one. @@ -168,8 +186,15 @@ Files are separated into: "/src/" and "/development/" == history -* [[https://github.com/jedie/PyInventory/compare/v0.6.0...master|compare v0.6.0...master]] **dev** +* [[https://github.com/jedie/PyInventory/compare/v0.7.0...master|compare v0.7.0...master]] **dev** ** tbc +* [[https://github.com/jedie/PyInventory/compare/v0.6.0...v0.7.0|v0.7.0 - 23.11.2020]] +** Change deployment setup: +*** Replace uwsgi with gunicorn +*** make deploy setup more generic by renaming "inventory" to "django" +*** Bugfix MEDIA path: store the files on a docker volumes +*** run app server as normal user and not root +*** pull all docker images before build * [[https://github.com/jedie/PyInventory/compare/v0.5.0...v0.6.0|v0.6.0 - 15.11.2020]] ** User can store images to every item: The image can only be accessed by the same user. * [[https://github.com/jedie/PyInventory/compare/v0.4.2...v0.5.0|v0.5.0 - 14.11.2020]] diff --git a/README.rst b/README.rst index edc4a9e..896fd2b 100644 --- a/README.rst +++ b/README.rst @@ -220,6 +220,28 @@ e.g.: Backwards-incompatible changes ------------------------------ +v0.7.0 +====== + +Docker-Compose usage: The MEDIA files was not stored on a docker volumes. + +You should backup rhe media files **before** update the containers! + +e.g.: + +:: + + ~/PyInventory/deployment$ make shell_inventory + root@inventory:/django# cp -Rfv /media/ /django_volumes/media/ + +The files are stored locally here: + +:: + + ~/PyInventory/deployment$ ls -la volumes/django/media/ + +Now, update the containers and copy the files back. + v0.5.0 ====== @@ -230,10 +252,24 @@ Files are separated into: "/src/" and "/development/" history ------- -* `compare v0.6.0...master `_ **dev** +* `compare v0.7.0...master `_ **dev** * tbc +* `v0.7.0 - 23.11.2020 `_ + + * Change deployment setup: + + * Replace uwsgi with gunicorn + + * make deploy setup more generic by renaming "inventory" to "django" + + * Bugfix MEDIA path: store the files on a docker volumes + + * run app server as normal user and not root + + * pull all docker images before build + * `v0.6.0 - 15.11.2020 `_ * User can store images to every item: The image can only be accessed by the same user. @@ -339,4 +375,4 @@ donation ------------ -``Note: this file is generated from README.creole 2020-11-15 14:43:10 with "python-creole"`` \ No newline at end of file +``Note: this file is generated from README.creole 2020-11-23 17:53:10 with "python-creole"`` \ No newline at end of file diff --git a/poetry.lock b/poetry.lock index 08aed45..eeb3c23 100644 --- a/poetry.lock +++ b/poetry.lock @@ -391,7 +391,7 @@ pprintpp = "*" [[package]] name = "docker" -version = "4.3.1" +version = "4.4.0" description = "A Python library for the Docker Engine API." category = "main" optional = true @@ -1201,7 +1201,7 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [[package]] name = "virtualenv" -version = "20.2.0" +version = "20.2.1" description = "Virtual Python Environment builder" category = "dev" optional = false @@ -1211,7 +1211,7 @@ python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7" appdirs = ">=1.4.3,<2" distlib = ">=0.3.1,<1" filelock = ">=3.0.0,<4" -importlib-metadata = {version = ">=0.12,<3", markers = "python_version < \"3.8\""} +importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""} six = ">=1.9.0,<2" [package.extras] @@ -1501,8 +1501,8 @@ django-tools = [ {file = "django_tools-0.46.1-py3-none-any.whl", hash = "sha256:e10c13b382b14ecfb589fd194719d44210a26a542869cbb298e0c2a1ede7f90d"}, ] docker = [ - {file = "docker-4.3.1-py2.py3-none-any.whl", hash = "sha256:13966471e8bc23b36bfb3a6fb4ab75043a5ef1dac86516274777576bed3b9828"}, - {file = "docker-4.3.1.tar.gz", hash = "sha256:bad94b8dd001a8a4af19ce4becc17f41b09f228173ffe6a4e0355389eef142f2"}, + {file = "docker-4.4.0-py2.py3-none-any.whl", hash = "sha256:317e95a48c32de8c1aac92a48066a5b73e218ed096e03758bcdd799a7130a1a1"}, + {file = "docker-4.4.0.tar.gz", hash = "sha256:cffc771d4ea1389fc66bc95cb72d304aa41d1a1563482a9a000fba3a84ed5071"}, ] docker-compose = [ {file = "docker-compose-1.27.4.tar.gz", hash = "sha256:5a5690f24c27d4b43dcbe6b3fae91ba680713208e99ee863352b3bae37bcaa83"}, @@ -1862,8 +1862,8 @@ urllib3 = [ {file = "urllib3-1.26.2.tar.gz", hash = "sha256:19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08"}, ] virtualenv = [ - {file = "virtualenv-20.2.0-py2.py3-none-any.whl", hash = "sha256:6af42359fbb33a6c7eab4d3246524b96fd9d8e07e7141b7a65998f96e28b2c57"}, - {file = "virtualenv-20.2.0.tar.gz", hash = "sha256:fd4147c5ba3f694e2e4fc3c767407dc2226899623bb9b49c2f15637c2ee335b3"}, + {file = "virtualenv-20.2.1-py2.py3-none-any.whl", hash = "sha256:07cff122e9d343140366055f31be4dcd61fd598c69d11cd33a9d9c8df4546dd7"}, + {file = "virtualenv-20.2.1.tar.gz", hash = "sha256:e0aac7525e880a429764cefd3aaaff54afb5d9f25c82627563603f5d7de5a6e5"}, ] webencodings = [ {file = "webencodings-0.5.1-py2.py3-none-any.whl", hash = "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78"}, diff --git a/pyproject.toml b/pyproject.toml index ce8b77d..2366f22 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "PyInventory" -version = "0.6.0" +version = "0.7.0" description = "Web based management to catalog things including state and location etc. using Python/Django." authors = ["JensDiemer "] packages = [ diff --git a/src/inventory/__init__.py b/src/inventory/__init__.py index 283e298..6ba40bf 100644 --- a/src/inventory/__init__.py +++ b/src/inventory/__init__.py @@ -4,7 +4,7 @@ :license: GNU GPL v3 or above, see LICENSE for more details. """ -__version__ = "0.6.0" +__version__ = "0.7.0" # https://docs.djangoproject.com/en/2.0/ref/applications/#configuring-applications-ref default_app_config = "inventory.apps.InventoryConfig"