Merge pull request #47 from nanoy42/release-1.1.0

Release 1.1.0

CHANGELOG.md

@@ -1,5 +1,19 @@
 # CHANGELOG
 
+## Version 1.1.0 (2021-12-26)
+
+#### Fixes
+
+* :bug: Fix [#43](https://github.com/nanoy42/dinomail/issues/43)
+* :bug: Fix [#33](https://github.com/nanoy42/dinomail/issues/33)
+* :bug: Fix django warnings on auto fields
+#### Docs
+
+* :bug: Fix [#32](https://github.com/nanoy42/dinomail/issues/32)
+#### Others
+
+* :arrow_up: Upgrade dependencies
+
 ## Version 1.0.0
 ### Context
 **Codename: Denver**

Pipfile

@@ -18,14 +18,11 @@ passlib = "*"
 argon2-cffi = "*"
 
 [packages]
-django = "*"
+django = ">=3, <4"
 django-bootstrap4 = "*"
 psycopg2 = "*"
 dnspython = "*"
 django-tastypie = "*"
 
-[requires]
-python_version = "3.8"
-
 [pipenv]
 allow_prereleases = true

dev-requirements.txt

@@ -1,63 +1,75 @@
+#
+# These requirements were autogenerated by pipenv
+# To regenerate from the project's Pipfile, run:
+#
+#    pipenv lock --requirements --dev
+#
+
+# Note: in pipenv 2020.x, "--dev" changed to emit both default and development
+# requirements. To emit only development requirements, pass "--dev-only".
+
 -i https://pypi.org/simple
 alabaster==0.7.12
-appdirs==1.4.4
-argon2-cffi==20.1.0
-asgiref==3.2.7; python_version >= '3.5'
-astroid==2.4.2; python_version >= '3.5'
-attrs==19.3.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-babel==2.8.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-bcrypt==3.1.7
-beautifulsoup4==4.9.1
-black==19.10b0
-certifi==2020.4.5.2
-cffi==1.14.0
-chardet==3.0.4
-click==7.1.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-coverage==5.1
-coveralls==2.0.0
-django-bootstrap4==2.0.1
+argon2-cffi-bindings==21.2.0; python_version >= '3.6'
+argon2-cffi==21.3.0
+asgiref==3.4.1; python_version >= '3.6'
+astroid==2.6.6; python_version ~= '3.6'
+babel==2.9.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+bcrypt==3.2.0
+beautifulsoup4==4.10.0; python_version >= '3.1'
+black==21.12b0
+certifi==2021.10.8
+cffi==1.15.0
+charset-normalizer==2.0.9; python_version >= '3'
+click==8.0.3; python_version >= '3.6'
+coverage==6.2
+coveralls==3.3.1
+django-bootstrap4==21.1
 django-tastypie==0.14.3
-django==3.0.7
-dnspython==1.16.0
+django==3.2.10
+dnspython==2.2.0rc1
 docopt==0.6.2
-docutils==0.16; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-idna==2.9; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-imagesize==1.2.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-isort==4.3.21; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-jinja2==2.11.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-lazy-object-proxy==1.4.3; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-markupsafe==1.1.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+docutils==0.17.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
+idna==3.3; python_version >= '3'
+imagesize==1.3.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+isort==5.10.1; python_version < '4.0' and python_full_version >= '3.6.1'
+jinja2==3.0.3; python_version >= '3.6'
+lazy-object-proxy==1.7.1; python_version >= '3.6'
+markupsafe==2.0.1; python_version >= '3.6'
 mccabe==0.6.1
-packaging==20.4; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-passlib==1.7.2
-pathspec==0.8.0
-psycopg2==2.8.5
-pycparser==2.20; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-pygments==2.6.1; python_version >= '3.5'
-pylint-django==2.0.15
+mypy-extensions==0.4.3
+packaging==21.3; python_version >= '3.6'
+passlib==1.7.4
+pathspec==0.9.0
+platformdirs==2.4.1; python_version >= '3.7'
+psycopg2==2.9.2
+pycparser==2.21; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+pygments==2.10.0; python_version >= '3.5'
+pylint-django==2.4.4
 pylint-plugin-utils==0.6
-pylint==2.5.3
-pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
-python-dateutil==2.8.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+pylint==3.0.0a4
+pyparsing==3.0.6; python_version >= '3.6'
+python-dateutil==2.8.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
 python-mimeparse==1.6.0
-pytz==2020.1
-pyyaml==5.3.1
-regex==2020.6.8
-requests==2.23.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-rope==0.17.0
-six==1.15.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-snowballstemmer==2.0.0
-soupsieve==2.0.1; python_version >= '3.5'
-sphinx-rtd-theme==0.4.3
-sphinx==3.1.0
+pytz==2021.3
+pyyaml==6.0
+requests==2.26.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'
+rope==0.22.0
+setuptools==60.1.0; python_version >= '3.7'
+six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+snowballstemmer==2.2.0
+soupsieve==2.3.1; python_version >= '3.6'
+sphinx-rtd-theme==1.0.0
+sphinx==4.3.2
 sphinxcontrib-applehelp==1.0.2; python_version >= '3.5'
 sphinxcontrib-devhelp==1.0.2; python_version >= '3.5'
-sphinxcontrib-htmlhelp==1.0.3; python_version >= '3.5'
+sphinxcontrib-htmlhelp==2.0.0; python_version >= '3.6'
 sphinxcontrib-jsmath==1.0.1; python_version >= '3.5'
 sphinxcontrib-qthelp==1.0.3; python_version >= '3.5'
-sphinxcontrib-serializinghtml==1.1.4; python_version >= '3.5'
-sqlparse==0.3.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-toml==0.10.1
-typed-ast==1.4.1
-urllib3==1.25.9; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'
+sphinxcontrib-serializinghtml==1.1.5; python_version >= '3.5'
+sqlparse==0.4.2; python_version >= '3.5'
+toml==0.10.2; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
+tomli==1.2.3; python_version >= '3.6'
+typing-extensions==4.0.1; python_version >= '3.10'
+urllib3==1.26.7; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4.0'
 wrapt==1.12.1

docs/source/conf.py

@@ -18,11 +18,11 @@
 # -- Project information -----------------------------------------------------
 
 project = "DinoMail"
-copyright = "2020, Yoann Pietri"
-author = "Yoann Pietri"
+copyright = "2020-2021, Yoann Piétri"
+author = "Yoann Piétri"
 
 # The full version, including alpha/beta/rc tags
-release = "1.0.0"
+release = "1.1.0"
 
 
 # -- General configuration ---------------------------------------------------

docs/source/index.rst

@@ -8,7 +8,7 @@ Welcome to DinoMail's documentation!
 
 DinoMail is a web interface that helps you managing your mail server.
 
-This is documention for DinoMail version 1.0.0 (codename Denver).
+This is documention for DinoMail version 1.1.0.
 
 .. toctree::
    :maxdepth: 2

docs/source/installation.rst

@@ -4,7 +4,7 @@ Installation
 Database
 ########
 
-You will need a working database for this project. We recommend the use of PostgreSQL but any database working with django (see `here <https://docs.djangoproject.com/en/3.0/ref/databases/>`_) will do the trick.
+You will need a working database for this project. We recommend the use of PostgreSQL but any database working with django (see `here <https://docs.djangoproject.com/en/3.2/ref/databases/>`__) will do the trick.
 
 However, please note that this software should be linked to mail server softwares like postfix and dovecot and that any datbase might not work with those. Please see the documentations of those before choosing any database.
 
@@ -43,12 +43,12 @@ In the ``src/dinomail`` folder there is file ``local_settings.example.py``. Copy
     cp src/dinomail/local_settings.example.py src/dinomail/local_settings.example.py
 
 
-Next, you will have to edit this file to change the settings. Some are django settings, some are api settings and some are DinoMail specific settings. There ar described below.
+Next, you will have to edit this file to change the settings. Some are django settings, some are api settings and some are DinoMail specific settings. They are described below.
 
 Django settings
 ***************
 
-Please see the `django documentation <https://docs.djangoproject.com/fr/3.0/ref/settings>`_ for extended documentation.
+Please see the `django documentation <https://docs.djangoproject.com/fr/3.2/ref/settings>`__ for extended documentation.
 
 .. attribute:: SECRET_KEY
 
@@ -88,6 +88,10 @@ User will not be able to change the interface language. However, you can select
 
 Those are the languages currently supported for DinoMail.
 
+.. attribute:: TIME_ZONE
+
+The time zone to use.
+
 .. attribute:: STATIC_ROOT
 
 Folder in which the static files should be copied.
@@ -103,7 +107,7 @@ Default number of object to display when an api request is made. 0 stands for no
 
 .. note:: If the value is not set, the default value from tastypie is 20.
 
-There are some other settings from tastypie, you can see them `here <https://django-tastypie.readthedocs.io/en/latest/settings.html>`_.
+There are some other settings from tastypie, you can see them `here <https://django-tastypie.readthedocs.io/en/latest/settings.html>`__.
 
 DinoMail settings
 *****************

requirements.txt

@@ -1,14 +1,21 @@
+#
+# These requirements were autogenerated by pipenv
+# To regenerate from the project's Pipfile, run:
+#
+#    pipenv lock --requirements
+#
+
 -i https://pypi.org/simple
-asgiref==3.2.7; python_version >= '3.5'
-beautifulsoup4==4.9.1
-django-bootstrap4==2.0.1
+asgiref==3.4.1; python_version >= '3.6'
+beautifulsoup4==4.10.0; python_version >= '3.1'
+django-bootstrap4==21.1
 django-tastypie==0.14.3
-django==3.0.7
-dnspython==1.16.0
-psycopg2==2.8.5
-python-dateutil==2.8.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+django==3.2.10
+dnspython==2.2.0rc1
+psycopg2==2.9.2
+python-dateutil==2.8.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
 python-mimeparse==1.6.0
-pytz==2020.1
-six==1.15.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-soupsieve==2.0.1; python_version >= '3.5'
-sqlparse==0.3.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+pytz==2021.3
+six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+soupsieve==2.3.1; python_version >= '3.6'
+sqlparse==0.4.2; python_version >= '3.5'

src/core/locale/fr/LC_MESSAGES/django.po

@@ -13,10 +13,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: DinoMail 1.0.0\n"
+"Project-Id-Version: DinoMail 1.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-28 13:17+0000\n"
-"PO-Revision-Date: 2020-09-38 13:37+0200\n"
+"POT-Creation-Date: 2021-12-26 18:34+0100\n"
+"PO-Revision-Date: 2021-12-26 18:36+0100\n"
 "Last-Translator: Yoann Pietri <[email protected]>\n"
 "Language-Team: \n"
 "Language: fr\n"
@@ -174,8 +174,8 @@ msgid "Legals"
 msgstr "Légal"
 
 #: core/templates/footer.html:16
-msgid "Made with ❤ by nanoy ♦ Version 1.0.0"
-msgstr "Fait avec des ❤ par nanoy ♦ Version 1.0.0"
+msgid "Made with ❤ by nanoy ♦ Version 1.1.0"
+msgstr "Fait avec des ❤ par nanoy ♦ Version 1.1.0"
 
 #: core/templates/home.html:17 core/templates/nav.html:17
 msgid "Domains"
@@ -411,6 +411,7 @@ msgid "All"
 msgstr "Tous"
 
 #: core/templates/virtual_domains_dkim_scan.html:4
+#, python-format
 msgid "DKIM scan for domain %(name)s"
 msgstr "Détails du scan DKIM for domain %(name)s"
 
@@ -565,6 +566,10 @@ msgstr "Les emails ne correspondent pas. Opération annulée."
 msgid "Delete user {}"
 msgstr "Suppression de l'utilisateur {}"
 
+#: core/views.py:611
+msgid "Alias {} was created"
+msgstr "L'alias {} a été créé"
+
 #: core/views.py:619
 msgid "Add alias"
 msgstr "Ajouter l'alias"

src/core/templates/footer.html

@@ -3,7 +3,7 @@
     <div class="collapse navbar-collapse" id="navbarSupportedContent">
         <ul class="navbar-nav mr-auto">
             <li class="nav-item">
-                <a class="nav-link" href="https://githum.com/nanoy42/DinoMail" target="_blank"><i
+                <a class="nav-link" href="https://github.com/nanoy42/DinoMail" target="_blank"><i
                         class=" fab fa-github"></i>
                     Github</a>
             </li>
@@ -13,7 +13,7 @@
             </li>
         </ul>
         <span class="navbar-text">
-            {% trans "Made with ❤ by nanoy ♦ Version 1.0.0" %}
+            {% trans "Made with ❤ by nanoy ♦ Version 1.1.0" %}
         </span>
     </div>
 </nav>

src/core/views.py

@@ -608,7 +608,7 @@ def add_virtual_alias(request):
     if form.is_valid():
         virtual_alias = form.save()
         messages.success(
-            request, "L'utilisateur {} a bien été créé".format(virtual_alias)
+            request, _("Alias {} was created").format(virtual_alias)
         )
         return redirect(reverse("virtual-aliases-index"))
     return render(

src/dinomail/locale/fr/LC_MESSAGES/django.po

@@ -14,7 +14,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: DinoMail 1.0.0\n"
+"Project-Id-Version: DinoMail 1.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-09-28 13:17+0000\n"
 "PO-Revision-Date: 2020-09-28 13:28+0200\n"

src/dinomail/settings.py

@@ -113,3 +113,5 @@
 STATICFILES_DIRS = [os.path.join(BASE_DIR, "staticfiles")]
 
 STATIC_URL = "/static/"
+
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'