Merge pull request #16 from jedie/updates

Updates
pull/18/head v0.4.1
Jens Diemer 2020-11-02 09:22:34 +01:00 zatwierdzone przez GitHub
commit 1bd3104397
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
7 zmienionych plików z 21 dodań i 15 usunięć

Wyświetl plik

@ -155,8 +155,10 @@ Nothing, yet ;)
== history
* [[https://github.com/jedie/PyInventory/compare/v0.4.0...master|compare v0.4.0...master]] **dev**
* [[https://github.com/jedie/PyInventory/compare/v0.4.1...master|compare v0.4.1...master]] **dev**
** tbc
* [[https://github.com/jedie/PyInventory/compare/v0.4.0...v0.4.1|v0.4.1 - 2.11.2020]]
** Small bugfixes
* [[https://github.com/jedie/PyInventory/compare/v0.3.2...v0.4.0|v0.4.0 - 1.11.2020]]
** Move docker stuff and production use information into separate git branch
** Add django-axes: keeping track of suspicious logins and brute-force attack blocking

Wyświetl plik

@ -214,10 +214,14 @@ Nothing, yet ;)
history
-------
* `compare v0.4.0...master <https://github.com/jedie/PyInventory/compare/v0.4.0...master>`_ **dev**
* `compare v0.4.1...master <https://github.com/jedie/PyInventory/compare/v0.4.1...master>`_ **dev**
* tbc
* `v0.4.1 - 2.11.2020 <https://github.com/jedie/PyInventory/compare/v0.4.0...v0.4.1>`_
* Small bugfixes
* `v0.4.0 - 1.11.2020 <https://github.com/jedie/PyInventory/compare/v0.3.2...v0.4.0>`_
* Move docker stuff and production use information into separate git branch
@ -303,4 +307,4 @@ donation
------------
``Note: this file is generated from README.creole 2020-11-01 20:29:20 with "python-creole"``
``Note: this file is generated from README.creole 2020-11-02 09:12:38 with "python-creole"``

Wyświetl plik

@ -4,7 +4,7 @@
:license: GNU GPL v3 or above, see LICENSE for more details.
"""
__version__ = "0.4.0"
__version__ = "0.4.1"
# https://docs.djangoproject.com/en/2.0/ref/applications/#configuring-applications-ref
default_app_config = "inventory.apps.InventoryConfig"

Wyświetl plik

@ -2,4 +2,4 @@ from inventory import __version__
def inventory_version_string(request):
return {"version_string": f"v{__version__}"}
return {'inventory_version_string': f'v{__version__}'}

Wyświetl plik

@ -7,11 +7,11 @@
<link rel="stylesheet" type="text/css" href="{% static 'inventory.css' %}">
{% endblock %}
{% block title %}{{ title }} | PyInventory {{ version_string }}{% endblock %}
{% block title %}{{ title }} | PyInventory {{ inventory_version_string }}{% endblock %}
{% block branding %}
<h1 id="site-name">
<a href="{% url 'admin:index' %}">PyInventory {{ version_string }}</a>
<a href="{% url 'admin:index' %}">PyInventory {{ inventory_version_string }}</a>
</h1>
{% endblock %}

14
poetry.lock wygenerowano
Wyświetl plik

@ -326,7 +326,7 @@ python-versions = "*"
[[package]]
name = "django-processinfo"
version = "1.0.0"
version = "1.0.1"
description = "Django application to collect information about the running server processes."
category = "main"
optional = false
@ -904,7 +904,7 @@ cli = ["click (>=5.0)"]
[[package]]
name = "pytz"
version = "2020.1"
version = "2020.4"
description = "World timezone definitions, modern and historical"
category = "main"
optional = false
@ -1227,7 +1227,7 @@ postgres = ["psycopg2-binary"]
[metadata]
lock-version = "1.1"
python-versions = ">=3.7,<4.0.0"
content-hash = "745c33aa94cad303222f51896f0a9a11abdb4896cb00f87f522fe7eaa8c2325a"
content-hash = "25a7823dbf3b22aa6878967aedfd01e5acbcbab9af884e5e47fc0637f757a763"
[metadata.files]
appdirs = [
@ -1437,8 +1437,8 @@ django-js-asset = [
{file = "django_js_asset-1.2.2-py2.py3-none-any.whl", hash = "sha256:8ec12017f26eec524cab436c64ae73033368a372970af4cf42d9354fcb166bdd"},
]
django-processinfo = [
{file = "django-processinfo-1.0.0.tar.gz", hash = "sha256:0df4b3a011a7adb1f6b722964aca4693e79fa003b7f780025cc0d04073f00c49"},
{file = "django_processinfo-1.0.0-py3-none-any.whl", hash = "sha256:829e2937a9fae54ef8c0a3cb5e99a09490cf66252cee498de833377839d7e497"},
{file = "django-processinfo-1.0.1.tar.gz", hash = "sha256:feff4f6a9a55fddeabba03ee67cfcdfe87f99895b1a032a077af37a1bb96606b"},
{file = "django_processinfo-1.0.1-py3-none-any.whl", hash = "sha256:eefa8de6f0da53c4a245411817bf3ec068357913b3dcb993285380cf9bd0ecc2"},
]
django-reversion = [
{file = "django-reversion-3.0.8.tar.gz", hash = "sha256:49e9930f90322dc6a2754dd26144285cfcc1c5bd0c1c39ca95d5602c5054ae32"},
@ -1672,8 +1672,8 @@ python-dotenv = [
{file = "python_dotenv-0.15.0-py2.py3-none-any.whl", hash = "sha256:0c8d1b80d1a1e91717ea7d526178e3882732420b03f08afea0406db6402e220e"},
]
pytz = [
{file = "pytz-2020.1-py2.py3-none-any.whl", hash = "sha256:a494d53b6d39c3c6e44c3bec237336e14305e4f29bbf800b599253057fbb79ed"},
{file = "pytz-2020.1.tar.gz", hash = "sha256:c35965d010ce31b23eeb663ed3cc8c906275d6be1a34393a1d73a41febf4a048"},
{file = "pytz-2020.4-py2.py3-none-any.whl", hash = "sha256:5c55e189b682d420be27c6995ba6edce0c0a77dd67bfbe2ae6607134d5851ffd"},
{file = "pytz-2020.4.tar.gz", hash = "sha256:3e6b7dd2d1e0a59084bcee14a17af60c5c562cdc16d828e8eba2e683d3a7e268"},
]
pyupgrade = [
{file = "pyupgrade-2.7.3-py2.py3-none-any.whl", hash = "sha256:071fec15248b7885381657d6701cc38ecf20d6c9ade5a58499c9456e0657de98"},

Wyświetl plik

@ -1,6 +1,6 @@
[tool.poetry]
name = "PyInventory"
version = "0.4.0"
version = "0.4.1"
description = "Web based management to catalog things including state and location etc. using Python/Django."
authors = ["JensDiemer <git@jensdiemer.de>"]
packages = [