Skip to content

Commit

Permalink
update library for documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
tokibito committed Feb 6, 2015
1 parent 0bc3875 commit 0189b07
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
4 changes: 2 additions & 2 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Sphinx
Django==1.6.2
pyftpdlib==1.3.0
Django==1.7.7
pyftpdlib==1.4.0
14 changes: 8 additions & 6 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
sys.path.insert(0, os.path.abspath('../../src/'))

def setup_django():
import django
from django.conf import settings
if not settings.configured:
settings.configure(
Expand All @@ -37,9 +38,10 @@ def setup_django():
'django_ftpserver',
)
)
from django.db.models.loading import cache as model_cache
if not model_cache.loaded:
model_cache._populate()
django.setup()
from django.apps import apps
if not apps.ready:
apps.populate()

setup_django()

Expand Down Expand Up @@ -70,16 +72,16 @@ def setup_django():

# General information about the project.
project = u'Django FTP server'
copyright = u'2014, Shinya Okano'
copyright = u'2015, Shinya Okano'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = '0.2'
version = '0.3.1'
# The full version, including alpha/beta/rc tags.
release = '0.2'
release = '0.3.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down

0 comments on commit 0189b07

Please sign in to comment.