Merge pull request #6 from jedie/develop

+test_update_rst_readme()
2020-10-17 22:27:01 +02:00 · 2020-10-17 22:27:01 +02:00 · 253d6fc0d7
commit 253d6fc0d7
--- a/README.creole
+++ b/README.creole
@ -69,19 +69,17 @@ create-starter       Create starter file.

 == Screenshots

-=== v0.0.1
+----
+
+{{https://raw.githubusercontent.com/jedie/jedie.github.io/master/screenshots/PyInventory/PyInventory v0.1.0 screenshot 1.png|PyInventory v0.1.0 screenshot 1.png}}

 ----

-{{https://raw.githubusercontent.com/jedie/jedie.github.io/master/screenshots/PyInventory/PyInventory v0.0.1 screenshot 3.png|PyInventory v0.0.1 screenshot 3.png}}
+{{https://raw.githubusercontent.com/jedie/jedie.github.io/master/screenshots/PyInventory/PyInventory v0.1.0 screenshot 2.png|PyInventory v0.1.0 screenshot 2.png}}

 ----

-{{https://raw.githubusercontent.com/jedie/jedie.github.io/master/screenshots/PyInventory/PyInventory v0.0.1 screenshot 2.png|PyInventory v0.0.1 screenshot 2.png}}
-
----
-
-{{https://raw.githubusercontent.com/jedie/jedie.github.io/master/screenshots/PyInventory/PyInventory v0.0.1 screenshot 1.png|PyInventory v0.0.1 screenshot 1.png}}
+{{https://raw.githubusercontent.com/jedie/jedie.github.io/master/screenshots/PyInventory/PyInventory v0.1.0 screenshot 3.png|PyInventory v0.1.0 screenshot 3.png}}

 ----

--- a/README.rst
+++ b/README.rst
@ -105,26 +105,23 @@ tbd
 Screenshots
 -----------

-v0.0.1
-======
+----
+
+|PyInventory v0.1.0 screenshot 1.png|
+
+.. |PyInventory v0.1.0 screenshot 1.png| image:: https://raw.githubusercontent.com/jedie/jedie.github.io/master/screenshots/PyInventory/PyInventory v0.1.0 screenshot 1.png

 ----

-|PyInventory v0.0.1 screenshot 3.png|
+|PyInventory v0.1.0 screenshot 2.png|

-.. |PyInventory v0.0.1 screenshot 3.png| image:: https://raw.githubusercontent.com/jedie/jedie.github.io/master/screenshots/PyInventory/PyInventory v0.0.1 screenshot 3.png
+.. |PyInventory v0.1.0 screenshot 2.png| image:: https://raw.githubusercontent.com/jedie/jedie.github.io/master/screenshots/PyInventory/PyInventory v0.1.0 screenshot 2.png

 ----

-|PyInventory v0.0.1 screenshot 2.png|
+|PyInventory v0.1.0 screenshot 3.png|

-.. |PyInventory v0.0.1 screenshot 2.png| image:: https://raw.githubusercontent.com/jedie/jedie.github.io/master/screenshots/PyInventory/PyInventory v0.0.1 screenshot 2.png
-
----
-
-|PyInventory v0.0.1 screenshot 1.png|
-
-.. |PyInventory v0.0.1 screenshot 1.png| image:: https://raw.githubusercontent.com/jedie/jedie.github.io/master/screenshots/PyInventory/PyInventory v0.0.1 screenshot 1.png
+.. |PyInventory v0.1.0 screenshot 3.png| image:: https://raw.githubusercontent.com/jedie/jedie.github.io/master/screenshots/PyInventory/PyInventory v0.1.0 screenshot 3.png

 ----

@ -175,4 +172,4 @@ donation

 ------------

-``Note: this file is generated from README.creole 2020-10-17 19:37:03 with "python-creole"``
+``Note: this file is generated from README.creole 2020-10-17 22:25:58 with "python-creole"``
--- a/inventory/context_processors.py
+++ b/inventory/context_processors.py
@ -0,0 +1,5 @@
+from inventory import __version__
+
+
+def inventory_version_string(request):
+    return {"version_string": f"v{__version__}"}
--- a/inventory/migrations/0002_auto_20201017_2211.py
+++ b/inventory/migrations/0002_auto_20201017_2211.py
@ -0,0 +1,39 @@
+# Generated by Django 2.2.16 on 2020-10-17 20:11
+
+from django.db import migrations
+import tagulous.models.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('inventory', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='itemlinkmodel',
+            name='tags',
+            field=tagulous.models.fields.TagField(_set_tag_meta=True, blank=True, case_sensitive=False, force_lowercase=False, help_text='BaseModel.tags.help_text', max_count=10, space_delimiter=False, to='inventory.Tagulous_ItemLinkModel_tags', verbose_name='BaseModel.tags.verbose_name'),
+        ),
+        migrations.AlterField(
+            model_name='itemmodel',
+            name='kind',
+            field=tagulous.models.fields.TagField(_set_tag_meta=True, case_sensitive=False, force_lowercase=False, help_text='ItemModel.kind.help_text', max_count=3, space_delimiter=False, to='inventory.Tagulous_ItemModel_kind', verbose_name='ItemModel.kind.verbose_name'),
+        ),
+        migrations.AlterField(
+            model_name='itemmodel',
+            name='producer',
+            field=tagulous.models.fields.TagField(_set_tag_meta=True, blank=True, case_sensitive=False, force_lowercase=False, help_text='ItemModel.producer.help_text', max_count=1, space_delimiter=False, to='inventory.Tagulous_ItemModel_producer', verbose_name='ItemModel.producer.verbose_name'),
+        ),
+        migrations.AlterField(
+            model_name='itemmodel',
+            name='tags',
+            field=tagulous.models.fields.TagField(_set_tag_meta=True, blank=True, case_sensitive=False, force_lowercase=False, help_text='BaseModel.tags.help_text', max_count=10, space_delimiter=False, to='inventory.Tagulous_ItemModel_tags', verbose_name='BaseModel.tags.verbose_name'),
+        ),
+        migrations.AlterField(
+            model_name='locationmodel',
+            name='tags',
+            field=tagulous.models.fields.TagField(_set_tag_meta=True, blank=True, case_sensitive=False, force_lowercase=False, help_text='BaseModel.tags.help_text', max_count=10, space_delimiter=False, to='inventory.Tagulous_LocationModel_tags', verbose_name='BaseModel.tags.verbose_name'),
+        ),
+    ]
--- a/inventory/models/base.py
+++ b/inventory/models/base.py
@ -30,7 +30,9 @@ class BaseModel(TimetrackingBaseModel):
    )
    tags = tagulous.models.TagField(
        blank=True,
+        case_sensitive=False,
        force_lowercase=False,
+        space_delimiter=False,
        max_count=10,
        verbose_name=_('BaseModel.tags.verbose_name'),
        help_text=_('BaseModel.tags.help_text')
--- a/inventory/models/item.py
+++ b/inventory/models/item.py
@ -12,13 +12,18 @@ class ItemModel(BaseModel):
    A Item that can be described and store somewhere ;)
    """
    kind = tagulous.models.TagField(
+        case_sensitive=False,
        force_lowercase=False,
+        space_delimiter=False,
        max_count=3,
        verbose_name=_('ItemModel.kind.verbose_name'),
        help_text=_('ItemModel.kind.help_text')
    )
    producer = tagulous.models.TagField(
-        force_lowercase=False, blank=True,
+        blank=True,
+        case_sensitive=False,
+        force_lowercase=False,
+        space_delimiter=False,
        max_count=1,
        verbose_name=_('ItemModel.producer.verbose_name'),
        help_text=_('ItemModel.producer.help_text')
--- a/inventory/models/links.py
+++ b/inventory/models/links.py
@ -78,5 +78,8 @@ class BaseLink(BaseModel):
            self.update_response_info()
        return super().full_clean(**kwargs)

+    def __str__(self):
+        return self.url
+
    class Meta:
        abstract = True
--- a/inventory/static/inventory.css
+++ b/inventory/static/inventory.css
@ -0,0 +1,10 @@
+#footer {
+    text-align: center;
+    font-size: 0.8em;
+    background: #eee;
+    border-top: 1px solid #555;
+}
+#footer p, #footer a {
+   	line-height: 0.3em;
+    color: #333;
+}
--- a/inventory_project/settings.py
+++ b/inventory_project/settings.py
@ -71,7 +71,7 @@ MIDDLEWARE = (
 TEMPLATES = [
    {
        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
+        "DIRS": [str(__Path(BASE_PATH, 'inventory_project', 'templates'))],
        'APP_DIRS': True,
        'OPTIONS': {
            'context_processors': [
@ -79,6 +79,7 @@ TEMPLATES = [
                'django.template.context_processors.request',
                'django.contrib.auth.context_processors.auth',
                'django.contrib.messages.context_processors.messages',
+                'inventory.context_processors.inventory_version_string',
            ],
        },
    },
--- a/inventory_project/templates/admin/base_site.html
+++ b/inventory_project/templates/admin/base_site.html
@ -0,0 +1,21 @@
+{% extends "admin/base.html" %}
+{% load i18n static %}
+
+{% block extrahead %}{{ block.super }}
+    <meta name="google" content="notranslate">
+    <link rel="stylesheet" type="text/css" href="{% static 'inventory.css' %}">
+{% endblock %}
+
+{% block title %}{{ title }} | PyInventory {{ version_string }}{% endblock %}
+
+{% block branding %}
+<h1 id="site-name">
+    <a href="{% url 'admin:index' %}">PyInventory {{ version_string }}</a>
+</h1>
+{% endblock %}
+
+{% block nav-global %}{% endblock %}
+
+{% block footer %}<div id="footer">
+    <a href="https://github.com/jedie/PyInventory">https://github.com/jedie/PyInventory</a>
+</div>{% endblock %}
--- a/inventory_tests/test_project_setup.py
+++ b/inventory_tests/test_project_setup.py
@ -3,6 +3,8 @@ import shutil
 import subprocess
 from pathlib import Path

+from creole.setup_utils import update_rst_readme
+
 import inventory


@ -58,3 +60,14 @@ def test_poetry_check(package_root=None):
    )
    print(output)
    assert output == 'All set!\n'
+
+
+def test_update_rst_readme(capsys):
+    rest_readme_path = update_rst_readme(
+        package_root=PACKAGE_ROOT, filename='README.creole'
+    )
+    captured = capsys.readouterr()
+    assert captured.out == 'Generate README.rst from README.creole...nothing changed, ok.\n'
+    assert captured.err == ''
+    assert isinstance(rest_readme_path, Path)
+    assert str(rest_readme_path).endswith('/README.rst')
--- a/poetry.lock
+++ b/poetry.lock
@ -76,7 +76,7 @@ django = "*"
 name = "certifi"
 version = "2020.6.20"
 description = "Python package for providing Mozilla's CA Bundle."
-category = "dev"
+category = "main"
 optional = false
 python-versions = "*"

@ -95,7 +95,7 @@ pycparser = "*"
 name = "chardet"
 version = "3.0.4"
 description = "Universal encoding detector for Python 2 and 3"
-category = "dev"
+category = "main"
 optional = false
 python-versions = "*"

@ -396,7 +396,7 @@ python-versions = "*"
 name = "idna"
 version = "2.10"
 description = "Internationalized Domain Names in Applications (IDNA)"
-category = "dev"
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"

@ -684,11 +684,11 @@ pytest = "*"

 [[package]]
 name = "python-creole"
-version = "1.4.6"
+version = "1.4.7"
 description = "python-creole is an open-source (GPL) markup converter in pure Python for: creole2html, html2creole, html2ReSt, html2textile"
 category = "dev"
 optional = false
-python-versions = ">=3.6,<4.0"
+python-versions = ">=3.6,<4.0.0"

 [package.dependencies]
 docutils = "*"
@ -749,7 +749,7 @@ md = ["cmarkgfm (>=0.2.0)"]
 name = "requests"
 version = "2.24.0"
 description = "Python HTTP for Humans."
-category = "dev"
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"

@ -912,7 +912,7 @@ tqdm = ">=4.14"
 name = "urllib3"
 version = "1.25.10"
 description = "HTTP library with thread-safe connection pooling, file post, and more."
-category = "dev"
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4"

@ -979,7 +979,7 @@ testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs (>=1.2.3)", "pyt
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.7,<4.0.0"
-content-hash = "d164a00462dfbb50f85ba6882679350cdfc82ff65e48a0d5d2b0fda6068a4b30"
+content-hash = "1d04353be2d22444baeac57568ab372c021a7735bd893245887a8a342589f19f"

 [metadata.files]
 appdirs = [
@ -1308,8 +1308,8 @@ pytest-randomly = [
    {file = "pytest_randomly-3.4.1-py3-none-any.whl", hash = "sha256:2c4df1390db72a33a4f44fac0c780e7883cd5968238efa2a2bdbdd54e3fc6681"},
 ]
 python-creole = [
-    {file = "python-creole-1.4.6.tar.gz", hash = "sha256:7e568876b7bfc9b9637eaa3d278fb4e3af896632800b2d068d2c27ee831c2678"},
-    {file = "python_creole-1.4.6-py3-none-any.whl", hash = "sha256:ad8bc005bbe7efd91cf37c4227365f456fd593af76b2b04cdce1704fcf36a368"},
+    {file = "python-creole-1.4.7.tar.gz", hash = "sha256:eb27bc3f31a4dcd896ab47098c283fed738993be1c1d91b3e33cbdf31e85910d"},
+    {file = "python_creole-1.4.7-py3-none-any.whl", hash = "sha256:9f7c59b16a07cd26de971b5bc6e648e4ce8f60c926f0d65ef33b3f819cc04b6e"},
 ]
 pytz = [
    {file = "pytz-2020.1-py2.py3-none-any.whl", hash = "sha256:a494d53b6d39c3c6e44c3bec237336e14305e4f29bbf800b599253057fbb79ed"},
--- a/pyproject.toml
+++ b/pyproject.toml
@ -55,6 +55,7 @@ requests = "*"  # https://github.com/psf/requests

 [tool.poetry.dev-dependencies]
 poetry-publish = "*"  # https://github.com/jedie/poetry-publish
+python-creole = "*"  # https://github.com/jedie/python-creole
 tox = "*"
 pytest = "*"
 pytest-randomly = "*"