Commit d45cfefb authored by Tim Graham's avatar Tim Graham
Browse files

Refs #25769 -- Updated docs to reflect get_version() uses PEP 0440.

parent a7752780

django/utils/version.py

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ from django.utils.lru_cache import lru_cache 




def get_version(version=None):

    "Returns a PEP 386-compliant version number from VERSION."

    "Returns a PEP 440-compliant version number from VERSION."

    version = get_complete_version(version)



    # Now build the two parts of the version number:

docs/conf.py

+4 −4
Original line number Diff line number Diff line
@@ -79,10 +79,10 @@ except ImportError: 
    release = version

else:

    def django_release():

        pep386ver = get_version()

        if VERSION[3:5] == ('alpha', 0) and 'dev' not in pep386ver:

            return pep386ver + '.dev'

        return pep386ver

        pep440ver = get_version()

        if VERSION[3:5] == ('alpha', 0) and 'dev' not in pep440ver:

            return pep440ver + '.dev'

        return pep440ver



    release = django_release()

docs/ref/django-admin.txt

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ Determining the version 


Run ``django-admin version`` to display the current Django version.



The output follows the schema described in :pep:`386`::

The output follows the schema described in :pep:`440`::



    1.4.dev17026

    1.4a1