Fix after merge

DCOD-OpenSource · Feb 9, 2020 · d3296da · d3296da
2 parents 644d4ee + 94cdf45
commit d3296da
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 25 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,6 +19,4 @@ before_install:
 script:
   - make tox
 after_success:
-  - |
-      make coverage
-      make coverage-upload
+  - make coveralls
diff --git a/MIT-LICENSE b/MIT-LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2019, DCOD
+Copyright (c) 2020, DCOD
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@
 
 
 .ONESHELL:
-PHONY: tox test makemessages compilemessages bumpversion build sign check check-build check-upload upload clean coverage coverage-upload release help
+PHONY: tox test makemessages compilemessages bumpversion build sign check check-build check-upload upload clean coveralls release help
 TEST_PYPI_URL=https://test.pypi.org/legacy/
 NAME=djversion
 EXTENSIONS=py,html,txt
@@ -70,11 +70,7 @@ clean:
 	done;\
 
 
-coverage:
-	coverage;\
-
-
-coverage-upload:
+coveralls:
 	coveralls;\
 
 
@@ -120,9 +116,7 @@ help:
 	@echo "        Upload package to PyPi using twine."
 	@echo "    clean:"
 	@echo "        Recursively delete useless autogenerated files and directories, directories and files lists can be overriden through 'TRASH_DIRS' and 'TRASH_FILES' variables."
-	@echo "    coverage:"
-	@echo "        Generate coverage report."
-	@echo "    coverage-upload:"
+	@echo "    coveralls:"
 	@echo "        Upload coverage report to Coveralls."
 	@echo "    release:"
 	@echo "        Release code."
diff --git a/README.rst b/README.rst
@@ -13,8 +13,8 @@ A django-project-version documentation
 
 Installation
 ------------
-* Obtain your copy of source code from the git repository: ``git clone https://github.com/DCOD-OpenSource/django-project-version.git``. Or download the latest release from https://github.com/DCOD-OpenSource/django-project-version/tags/.
-* Run ``python ./setup.py install`` from the repository source tree or unpacked archive. Or use pip: ``pip install django-project-version``.
+* Obtain your copy of source code from the git repository: ``$ git clone https://github.com/DCOD-OpenSource/django-project-version.git``. Or download the latest release from https://github.com/DCOD-OpenSource/django-project-version/tags/.
+* Run ``$ python ./setup.py install`` from the repository source tree or unpacked archive. Or use pip: ``$ pip install django-project-version``.
 
 Configuration
 -------------
@@ -28,7 +28,6 @@ Configuration
         "djversion",
     ]
 
-
 Settings
 --------
 ``DJVERSION_VERSION``
@@ -73,14 +72,13 @@ Or you can use ``project_version`` templatetag which can be loaded from ``djvers
     {% project_version as VERSION %}
     {{ VERSION }}
 
-
 Also simple management command ``print-version`` which prints project version to stdout is available. Just run: ``$ python manage.py print-version`` from project folder.
 
 Advanced features
 -----------------
 If you want to have REST-style view with your project version:
 
-* Install ``django-project-version`` with additional dependencies: ``pip install django-project-version[rest]``.
+* Install ``django-project-version`` with additional dependencies: ``$ pip install django-project-version[rest]``.
 * Extend you ``settings.INSTALLED_APPS`` by adding ``"rest_framework"``.
 
 .. code-block:: python
@@ -103,7 +101,7 @@ If you want to have REST-style view with your project version:
 
 Or to use information from the project git repository as project version:
 
-* Install ``django-project-version`` with additional dependencies: ``pip install django-project-version[git]``.
+* Install ``django-project-version`` with additional dependencies: ``$ pip install django-project-version[git]``.
 * Configure git related settings.
 
 Licensing

diff --git a/djversion/locale/en/LC_MESSAGES/django.mo b/djversion/locale/en/LC_MESSAGES/django.mo
diff --git a/djversion/locale/en/LC_MESSAGES/django.po b/djversion/locale/en/LC_MESSAGES/django.po
@@ -4,9 +4,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: django-project-version 0.8.1\n"
+"Project-Id-Version: django-project-version 0.8.2\n"
 "Report-Msgid-Bugs-To: Alexei Andrushievich <vint21h@vint21h.pp.ua>\n"
-"POT-Creation-Date: 2020-02-07 16:19+0200\n"
+"POT-Creation-Date: 2020-02-09 19:12+0200\n"
 "PO-Revision-Date: 2019-09-11 04:53+0300\n"
 "Last-Translator: Alexei Andrushievich <vint21h@vint21h.pp.ua>\n"
 "Language-Team: Alexei Andrushievich <vint21h@vint21h.pp.ua>\n"

diff --git a/djversion/locale/uk/LC_MESSAGES/django.mo b/djversion/locale/uk/LC_MESSAGES/django.mo
diff --git a/djversion/locale/uk/LC_MESSAGES/django.po b/djversion/locale/uk/LC_MESSAGES/django.po
@@ -4,9 +4,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: django-project-version 0.8.1\n"
+"Project-Id-Version: django-project-version 0.8.2\n"
 "Report-Msgid-Bugs-To: Alexei Andrushievich <vint21h@vint21h.pp.ua>\n"
-"POT-Creation-Date: 2020-02-07 16:19+0200\n"
+"POT-Creation-Date: 2020-02-09 19:12+0200\n"
 "PO-Revision-Date: 2019-09-11 04:53+0300\n"
 "Last-Translator: Alexei Andrushievich <vint21h@vint21h.pp.ua>\n"
 "Language-Team: Alexei Andrushievich <vint21h@vint21h.pp.ua>\n"

diff --git a/setup.cfg b/setup.cfg
@@ -4,7 +4,7 @@
 
 [metadata]
 name = django-project-version
-version = 0.8.1
+version = 0.8.2
 description = Django reusable app to show your project version
 python-requires = >=3.6
 license-file = MIT-LICENSE

diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -38,7 +38,8 @@ def test_get_version(self) -> None:
     @override_settings(DJVERSION_FORMAT_STRING="{updated}: {version}")
     def test_get_version__with_custom_format_string(self) -> None:
         """
-        Util must return current version and updated date formatted using custom format string.  # noqa: E501
+        Util must return current version and
+        updated date formatted using custom format string.
 
         :return: nothing.
         :rtype: None.