Merge branch 'master' of https://github.com/WoLpH/django-tags-input

.github/stale.yml

@@ -0,0 +1,58 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 60
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 7
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+  - security
+  - "[Status] Maybe Later"
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: true
+
+# Label to use when marking as stale
+staleLabel: wontfix
+
+# Comment to post when marking as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+
+# Comment to post when removing the stale label.
+# unmarkComment: >
+#   Your comment here.
+
+# Comment to post when closing a stale Issue or Pull Request.
+# closeComment: >
+#   Your comment here.
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+# Limit to only `issues` or `pulls`
+# only: issues
+
+# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
+# pulls:
+#   daysUntilStale: 30
+#   markComment: >
+#     This pull request has been automatically marked as stale because it has not had
+#     recent activity. It will be closed if no further activity occurs. Thank you
+#     for your contributions.
+
+# issues:
+#   exemptLabels:
+#     - confirmed

MANIFEST.in

@@ -1,7 +1,7 @@
 include tags_input
 recursive-include tags_input *.py
 recursive-include tags_input/templates *.html
-recursive-include tags_input/static *.js
-recursive-include tags_input/static *.css
-recursive-include tags_input/static *.png
+include tags_input/static *.min.js
+include tags_input/static *.min.css
+include tags_input/static *.png
 

README.rst

@@ -129,9 +129,13 @@ To test the project simply clone the repository, install and run the example:
 
 .. code-block:: bash
 
+    # mkvirtualenv is part of virtualenvwrapper, using a regular virtualenv, pyvenv or pipenv is also possible
+    # Or even without any type of virtualenv at all
     mkvirtualenv django-tags-input
     git clone https://github.com/WoLpH/django-tags-input.git
-    pip install -e django-tags-input
+    # Tested with up to Django 2.1
+    pip install django
+    pip install -e 'django-tags-input[tests]'
     cd django-tags-input/example
     python manage.py runserver
 

example/settings.py

@@ -25,9 +25,6 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS = []
-
-
 # Application definition
 
 INSTALLED_APPS = [

setup.py

@@ -47,15 +47,13 @@ def run_tests(self):
         package_data={
             'tags_input': [
                 'templates/*.html',
-                'static/js/*.js',
-                'static/css/*.css',
-                'static/css/base/*.css',
-                'static/css/base/images/*.png',
+                'static/*.min.js',
+                'static/*.min.css',
             ],
         },
         extras_require={
             'docs': [
-                'django<2',
+                'django<2.1',
                 'mock',
                 'sphinx>=1.7.2',
             ],

tags_input/__about__.py

@@ -1,5 +1,5 @@
 __package_name__ = 'django-tags-input'
-__version__ = '4.3.0'
+__version__ = '4.4.2'
 __author__ = 'Rick van Hattem'
 __author_email__ = 'wolph@wol.ph'
 __description__ = ' '.join('''

tags_input/admin.py

@@ -30,11 +30,8 @@ def formfield_for_manytomany(self, db_field, request=None, **kwargs):
         tag_fields = self.get_tag_fields()
 
         if tag_fields and db_field.name not in tag_fields:
-            print('in fields', tag_fields, db_field.name)
             return super(TagsInputMixin, self).formfield_for_manytomany(
                 db_field, request, **kwargs)
-        else:
-            print('nin fields', tag_fields, db_field.name)
 
         queryset = db_field.related_model._default_manager.get_queryset()
         # queryset = db_field.rel.to._default_manager.get_queryset()

tags_input/widgets.py

@@ -87,20 +87,18 @@ class Media:
 
         css = {
             'all': (
-                'jquery-tagsinput-revisited-2.0/dist/'
-                'jquery.tagsinput-revisited.min.css',
+                'jquery.tagsinput-revisited-2.0.min.css',
             ),
         }
         js = (
-            'jquery-tagsinput-revisited-2.0/dist/'
-            'jquery.tagsinput-revisited.min.js',
+            'jquery.tagsinput-revisited-2.0.min.js',
         )
         enable_jquery = getattr(settings, 'TAGS_INPUT_INCLUDE_JQUERY', True)
         if enable_jquery:  # pragma: no cover
-            css['all'] += 'jquery-ui-1.12.1/jquery-ui.min.css',
+            css['all'] += 'jquery-ui-1.12.1.min.css',
             js = (
                 'jquery-3.2.1.min.js',
-                'jquery-ui-1.12.1/jquery-ui.min.js',
+                'jquery-ui-1.12.1.min.js',
             ) + js
 
 
@@ -117,15 +115,13 @@ class Media:
 
         css = getattr(settings, 'TAGS_INPUT_ADMIN_CSS', {
             'all': (
-                'jquery-tagsinput-revisited-2.0/dist/'
-                'jquery.tagsinput-revisited.min.css',
-                'jquery-ui-1.12.1/jquery-ui.min.css',
+                'jquery.tagsinput-revisited-2.0.min.css',
+                'jquery-ui-1.12.1.min.css',
             ),
         })
         js = getattr(settings, 'TAGS_INPUT_ADMIN_JS', (
             'jquery-3.2.1.min.js',
-            'jquery-ui-1.12.1/jquery-ui.min.js',
-            'jquery-tagsinput-revisited-2.0/dist/'
-            'jquery.tagsinput-revisited.min.js',
+            'jquery-ui-1.12.1.min.js',
+            'jquery.tagsinput-revisited-2.0.min.js',
         ))