Skip to content
This repository was archived by the owner on Sep 5, 2021. It is now read-only.

Commit 86e0782

Browse files
authored
Merge pull request #9 from sergeyklay/fix/packaging
Packaging fixes
2 parents f0a7802 + c3df6c6 commit 86e0782

File tree

8 files changed

+43
-6
lines changed

8 files changed

+43
-6
lines changed

CHANGELOG.rst

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,32 @@ This file contains a brief summary of new features and dependency changes or
55
releases, in reverse chronological order.
66

77

8+
2.0.1 (2021-05-25)
9+
------------------
10+
11+
Bug Fixes
12+
^^^^^^^^^
13+
14+
* Fixed changelog URL in package description.
15+
* Added missed ``test_env.txt`` to the package contents.
16+
17+
18+
Improved Documentation
19+
^^^^^^^^^^^^^^^^^^^^^^
20+
21+
* Improved package documentation.
22+
* Fixed misspellings in the documentation.
23+
24+
25+
Trivial/Internal Changes
26+
^^^^^^^^^^^^^^^^^^^^^^^^
27+
28+
* Added testing dependencies to ``setup.py``.
29+
30+
31+
----
32+
33+
834
2.0.0 (2021-05-25)
935
------------------
1036

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ include AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst LICENSE README.rst SECURITY.r
1616
# Many OS distributions prefers provide an ability run the tests
1717
# during the package installation.
1818
recursive-include tests *.py
19+
recursive-include tests *.txt
1920

2021
# All files in the sdist with a .pyc, .pyo, or .pyd extension will be removed
2122
# from the sdist.

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ and the latest release on `PyPI <https://pypi.org/project/django-environ-2/>`_.
117117
It’s rigorously tested on Python 3.6+, and officially supports
118118
Django 1.11, 2.2, 3.0, 3.1 and 3.2.
119119

120-
If you'd like to contribute to Gstore you're most welcome!
120+
If you'd like to contribute to ``django-environ-2`` you're most welcome!
121121

122122
.. -support-
123123

docs/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ def find_version(meta_file):
5656
"sphinx.ext.doctest",
5757
"sphinx.ext.intersphinx",
5858
"sphinx.ext.todo",
59+
"notfound.extension"
5960
]
6061

6162
# Add any paths that contain templates here, relative to this directory.

environ/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
1414
Modules:
1515
16+
compat
1617
environ
1718
1819
Misc variables:
@@ -35,7 +36,7 @@
3536

3637

3738
__copyright__ = 'Copyright (C) 2021 Serghei Iakovlev'
38-
__version__ = '2.0.0'
39+
__version__ = '2.0.1'
3940
__license__ = 'MIT'
4041
__author__ = 'Daniele Faraglia'
4142
__author_email__ = 'daniele.faraglia@gmail.com'

environ/environ.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
# For the full copyright and license information, please view
77
# the LICENSE file that was distributed with this source code.
88

9-
"""
9+
"""Configure Django made easy.
10+
1011
django-environ-2 allows you to utilize 12factor inspired environment
1112
variables to configure your Django application.
13+
1214
"""
1315

1416
import ast

setup.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def changes():
5252
'===================\n',
5353
changes(),
5454
'',
55-
f"`Full changelog <{find_meta('url')}/en/latest/changelog.htm>`_.",
55+
f"`Full changelog <{find_meta('url')}/en/latest/changelog.html>`_.",
5656
'',
5757
read_file(path.join(PKG_DIR, 'SECURITY.rst')),
5858
'',
@@ -157,19 +157,24 @@ def get_version_string():
157157
#
158158
EXTRAS_REQUIRE = {
159159
# Dependencies that are required to run tests
160-
'testing': [],
160+
'testing': [
161+
"pytest>=6.2.0", # Our test framework
162+
'pytest-cov>=2.11.1', # Pytest plugin for measuring coverage
163+
],
161164
# Dependencies that are required to develop package
162165
'develop': [],
163166
# Dependencies that are required to build documentation
164167
'docs': [
165168
'furo>=2020.12.30b24,==2020.12.*', # Sphinx documentation theme
166169
'sphinx>=3.5.0', # Python documentation generator
170+
"sphinx-notfound-page", # Create a custom 404 page
167171
],
168172
}
169173

170174
# Project's URLs
171175
PROJECT_URLS = {
172176
'Documentation': 'https://django-environ-2.readthedocs.io',
177+
"Changelog": f"{find_meta('url')}/en/latest/changelog.html",
173178
'Bug Tracker': 'https://github.com/sergeyklay/django-environ-2/issues',
174179
'Source Code': 'https://github.com/sergeyklay/django-environ-2',
175180
}

tox.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# For the full copyright and license information, please view
77
# the LICENSE file that was distributed with this source code.
88

9-
# Tox (http://tox.testrun.org/) - run tests in multiple virtualenvs.
9+
# Tox (https://tox.readthedocs.io) - run tests in multiple virtualenvs.
1010
# Also contains configuration settings for all tools executed by Tox.
1111

1212
[tox]
@@ -55,6 +55,7 @@ commands_pre =
5555
commands = flake8 environ
5656

5757
[testenv:docs]
58+
description = Build package documentation (HTML)
5859
# Keep basepython in sync with gh-actions and .readthedocs.yml.
5960
basepython = python3.8
6061
extras = docs

0 commit comments

Comments
 (0)