Set Sphinx project settings in conf.py file

.gitignore

@@ -20,3 +20,6 @@ venv/
 geckodriver.log
 ghostdriver.log
 .coverage
+
+coverage.xml
+.eggs/

.travis.yml

@@ -34,6 +34,11 @@ script: tox
 
 after_success: codecov
 
+stages:
+  - test
+  - name: deploy
+    if: tag is present
+
 jobs:
   include:
     - python: "3.5"
@@ -51,29 +56,32 @@ jobs:
       node_js: lts/*
       cache: npm
     - stage: deploy
-      if: tag IS present
-      python: 3.7
+      python: "3.7"
       install: skip
       script: skip
-      after_success: skip
-
-before_deploy:
-  - git stash --all
-  - ./set_version.py
-_deploy_provider: &_deploy_provider
-  skip_cleanup: true
-  on:
-    tags: true
-    repo: applegrew/django-select2
-deploy:
-  - <<: *_deploy_provider
-    provider: pypi
-    distributions: sdist bdist_wheel
-    user: codingjoe
-    password:
-      secure: fEP9K7y0ZF9fRvQEUN4kgPXQEZvi3Cx3ikUebG2UM/2uhcaUQm0+KpgZ2S+lvOTYcBnNgzPzFsVIZMcVcTxwIKuQDEMq9y2eop2hnisb9KXsIm9qPYSzOnRm74VuiOt4hNOZMe0qVBK2cO3vC9NDXuzdI8A0JynJhthfl4t+kFM=
-  - <<: *_deploy_provider
-    provider: npm
-    email: info@johanneshoppe.com
-    api_key:
-      secure: PV38cQx9qhEFkpSdytbM72UzIMCfhpjmRJ8dzT+bCAaOIs5rEcyKN+h1r5ranunCxWyuFsMW4A2iW/SCxnKCR/oPAguuwUbT5ogBXlsskqPFWUxuoTHYMrd+zB+SC6+bMgq+o5ul+kJCYtEkWP6cMlIEzKyTLab7m5PsnDXNVnI=
+      after_success: true
+      deploy:
+          provider: pypi
+          distributions: sdist bdist_wheel
+          on:
+            tags: true
+          user: codingjoe
+          password:
+            secure: fEP9K7y0ZF9fRvQEUN4kgPXQEZvi3Cx3ikUebG2UM/2uhcaUQm0+KpgZ2S+lvOTYcBnNgzPzFsVIZMcVcTxwIKuQDEMq9y2eop2hnisb9KXsIm9qPYSzOnRm74VuiOt4hNOZMe0qVBK2cO3vC9NDXuzdI8A0JynJhthfl4t+kFM=
+    - stage: deploy
+      language: node_js
+      node_js: lts/*
+      python: "3.7"
+      install: skip
+      script: skip
+      after_success: true
+      skip_cleanup: true
+      before_deploy:
+        - ./set_version.py
+      deploy:
+        provider: npm
+        on:
+          tags: true
+        email: info@johanneshoppe.com
+        api_key:
+          secure: PV38cQx9qhEFkpSdytbM72UzIMCfhpjmRJ8dzT+bCAaOIs5rEcyKN+h1r5ranunCxWyuFsMW4A2iW/SCxnKCR/oPAguuwUbT5ogBXlsskqPFWUxuoTHYMrd+zB+SC6+bMgq+o5ul+kJCYtEkWP6cMlIEzKyTLab7m5PsnDXNVnI=

MANIFEST.in

@@ -0,0 +1,2 @@
+include django_select2/static/django_select2/django_select2.js
+prune tests

docs/conf.py

@@ -1,39 +1,52 @@
-import os
-import sys
-
-# This is needed since django_select2 requires django model modules
-# and those modules assume that django settings is configured and
-# have proper DB settings.
-# Using this we give a proper environment with working django settings.
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "tests.testapp.settings")
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.insert(0, os.path.abspath('../tests.testapp'))
-sys.path.insert(0, os.path.abspath('..'))
-
-extensions = [
-    'sphinx.ext.autodoc',
-    'sphinx.ext.napoleon',
-    'sphinx.ext.inheritance_diagram',
-    'sphinx.ext.intersphinx',
-    'sphinx.ext.viewcode',
-    'sphinx.ext.doctest',
-]
-
-intersphinx_mapping = {
-    'python': ('http://docs.python.org/3', None),
-    'django': ('https://docs.djangoproject.com/en/stable/',
-               'https://docs.djangoproject.com/en/stable/_objects/'),
-}
-
-autodoc_default_flags = ['members', 'show-inheritance']
-autodoc_member_order = 'bysource'
-
-inheritance_graph_attrs = dict(rankdir='TB')
-
-inheritance_node_attrs = dict(shape='rect', fontsize=14, fillcolor='gray90',
-                              color='gray30', style='filled')
-
-inheritance_edge_attrs = dict(penwidth=0.75)
+import os
+import sys
+
+from pkg_resources import get_distribution
+
+# This is needed since django_select2 requires django model modules
+# and those modules assume that django settings is configured and
+# have proper DB settings.
+# Using this we give a proper environment with working django settings.
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "tests.testapp.settings")
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+sys.path.insert(0, os.path.abspath('../tests.testapp'))
+sys.path.insert(0, os.path.abspath('..'))
+
+
+project = "Django-Select2"
+author = "Johannes Hoppe"
+copyright = "2017, Johannes Hoppe"
+release = get_distribution('django_select2').version
+version = '.'.join(release.split('.')[:2])
+
+
+master_doc = 'index'  # default in Sphinx v2
+
+
+extensions = [
+    'sphinx.ext.autodoc',
+    'sphinx.ext.napoleon',
+    'sphinx.ext.inheritance_diagram',
+    'sphinx.ext.intersphinx',
+    'sphinx.ext.viewcode',
+    'sphinx.ext.doctest',
+]
+
+intersphinx_mapping = {
+    'python': ('http://docs.python.org/3', None),
+    'django': ('https://docs.djangoproject.com/en/stable/',
+               'https://docs.djangoproject.com/en/stable/_objects/'),
+}
+
+autodoc_default_flags = ['members', 'show-inheritance']
+autodoc_member_order = 'bysource'
+
+inheritance_graph_attrs = dict(rankdir='TB')
+
+inheritance_node_attrs = dict(shape='rect', fontsize=14, fillcolor='gray90',
+                              color='gray30', style='filled')
+
+inheritance_edge_attrs = dict(penwidth=0.75)

setup.cfg

@@ -24,7 +24,7 @@ install_requires =
     django>=2.0
     django-appconf>=0.6.0
 setup_requires =
-    very-good-setuptools-git-version
+    setuptools_scm
     sphinx
     pytest-runner
 tests_require =
@@ -33,13 +33,6 @@ tests_require =
     pytest-django
     selenium
 
-[options.package_data]
-* = *.txt, *.rst, *.html, *.po
-
-[options.packages.find]
-exclude =
-    tests
-
 [bdist_wheel]
 universal = 1
 
@@ -54,8 +47,6 @@ test = pytest
 [build_sphinx]
 source-dir = docs
 build-dir = docs/_build
-project = Django-Select2
-copyright = 2017 Johannes Hoppe
 
 [tool:pytest]
 addopts = --cov=django_select2 --cov-report xml

setup.py

@@ -2,4 +2,4 @@
 
 from setuptools import setup
 
-setup(version_format='{tag}')
+setup(use_scm_version=True)