pylint-dev · atodorov · Mar 5, 2018 · Mar 4, 2018 · Mar 4, 2018
diff --git a/.coveragerc b/.coveragerc
@@ -1,3 +1,5 @@
-
 [run]
 source=pylint_django
+
+[report]
+omit=pylint_django/tests/*
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,3 +1,4 @@
+include *.md
 include LICENSE
-include pylint_django/transforms/transforms/*
-include test/input/*.txt test/input/*.rc
+include pylint_django/transforms/transforms/*.py
+recursive-include pylint_django/tests/ *.py *.rc *.txt
diff --git a/test/__init__.py → pylint_django/tests/__init__.py b/test/__init__.py → pylint_django/tests/__init__.py
diff --git a/test/input/__init__.py → pylint_django/tests/input/__init__.py b/test/input/__init__.py → pylint_django/tests/input/__init__.py
diff --git a/...rnal_django_tables2_noerror_meta_class.py → ...rnal_django_tables2_noerror_meta_class.py b/...rnal_django_tables2_noerror_meta_class.py → ...rnal_django_tables2_noerror_meta_class.py
diff --git a/.../input/external_drf_noerror_serializer.py → .../input/external_drf_noerror_serializer.py b/.../input/external_drf_noerror_serializer.py → .../input/external_drf_noerror_serializer.py
diff --git a/.../input/external_drf_noerror_serializer.rc → .../input/external_drf_noerror_serializer.rc b/.../input/external_drf_noerror_serializer.rc → .../input/external_drf_noerror_serializer.rc
diff --git a/...ernal_psycopg2_noerror_postgres_fields.py → ...ernal_psycopg2_noerror_postgres_fields.py b/...ernal_psycopg2_noerror_postgres_fields.py → ...ernal_psycopg2_noerror_postgres_fields.py
diff --git a/...ernal_psycopg2_noerror_postgres_fields.rc → ...ernal_psycopg2_noerror_postgres_fields.rc b/...ernal_psycopg2_noerror_postgres_fields.rc → ...ernal_psycopg2_noerror_postgres_fields.rc
diff --git a/...t/func_model_does_not_use_unicode_py33.py → ...t/func_model_does_not_use_unicode_py33.py b/...t/func_model_does_not_use_unicode_py33.py → ...t/func_model_does_not_use_unicode_py33.py
diff --git a/.../func_model_does_not_use_unicode_py33.txt → .../func_model_does_not_use_unicode_py33.txt b/.../func_model_does_not_use_unicode_py33.txt → .../func_model_does_not_use_unicode_py33.txt
diff --git a/test/input/func_noerror_classviews.py → ...go/tests/input/func_noerror_classviews.py b/test/input/func_noerror_classviews.py → ...go/tests/input/func_noerror_classviews.py
diff --git a/..._noerror_duplicate_except_doesnotexist.py → ..._noerror_duplicate_except_doesnotexist.py b/..._noerror_duplicate_except_doesnotexist.py → ..._noerror_duplicate_except_doesnotexist.py
diff --git a/...ut/func_noerror_foreign_key_attributes.py → ...ut/func_noerror_foreign_key_attributes.py b/...ut/func_noerror_foreign_key_attributes.py → ...ut/func_noerror_foreign_key_attributes.py
diff --git a/test/input/func_noerror_foreign_key_ids.py → ...sts/input/func_noerror_foreign_key_ids.py b/test/input/func_noerror_foreign_key_ids.py → ...sts/input/func_noerror_foreign_key_ids.py
diff --git a/test/input/func_noerror_foreign_key_sets.py → ...ts/input/func_noerror_foreign_key_sets.py b/test/input/func_noerror_foreign_key_sets.py → ...ts/input/func_noerror_foreign_key_sets.py
diff --git a/test/input/func_noerror_foreignkeys.py → ...o/tests/input/func_noerror_foreignkeys.py b/test/input/func_noerror_foreignkeys.py → ...o/tests/input/func_noerror_foreignkeys.py
diff --git a/test/input/func_noerror_form_fields.py → ...o/tests/input/func_noerror_form_fields.py b/test/input/func_noerror_form_fields.py → ...o/tests/input/func_noerror_form_fields.py
diff --git a/test/input/func_noerror_forms_py33.py → ...go/tests/input/func_noerror_forms_py33.py b/test/input/func_noerror_forms_py33.py → ...go/tests/input/func_noerror_forms_py33.py
diff --git a/.../input/func_noerror_formview_ancestors.py → .../input/func_noerror_formview_ancestors.py b/.../input/func_noerror_formview_ancestors.py → .../input/func_noerror_formview_ancestors.py
diff --git a/...nput/func_noerror_ignore_meta_subclass.py → ...nput/func_noerror_ignore_meta_subclass.py b/...nput/func_noerror_ignore_meta_subclass.py → ...nput/func_noerror_ignore_meta_subclass.py
diff --git a/test/input/func_noerror_import_q.py → ...ango/tests/input/func_noerror_import_q.py b/test/input/func_noerror_import_q.py → ...ango/tests/input/func_noerror_import_q.py
diff --git a/test/input/func_noerror_issue_46.py → ...ango/tests/input/func_noerror_issue_46.py b/test/input/func_noerror_issue_46.py → ...ango/tests/input/func_noerror_issue_46.py
diff --git a/test/input/func_noerror_manytomanyfield.py → ...sts/input/func_noerror_manytomanyfield.py b/test/input/func_noerror_manytomanyfield.py → ...sts/input/func_noerror_manytomanyfield.py
diff --git a/test/input/func_noerror_model_fields.py → .../tests/input/func_noerror_model_fields.py b/test/input/func_noerror_model_fields.py → .../tests/input/func_noerror_model_fields.py
diff --git a/test/input/func_noerror_model_methods.py → ...tests/input/func_noerror_model_methods.py b/test/input/func_noerror_model_methods.py → ...tests/input/func_noerror_model_methods.py
diff --git a/...ut/func_noerror_model_unicode_callable.py → ...ut/func_noerror_model_unicode_callable.py b/...ut/func_noerror_model_unicode_callable.py → ...ut/func_noerror_model_unicode_callable.py
diff --git a/...nput/func_noerror_model_unicode_lambda.py → ...nput/func_noerror_model_unicode_lambda.py b/...nput/func_noerror_model_unicode_lambda.py → ...nput/func_noerror_model_unicode_lambda.py
diff --git a/test/input/func_noerror_models_py33.py → ...o/tests/input/func_noerror_models_py33.py b/test/input/func_noerror_models_py33.py → ...o/tests/input/func_noerror_models_py33.py
diff --git a/...put/func_noerror_protected_meta_access.py → ...put/func_noerror_protected_meta_access.py b/...put/func_noerror_protected_meta_access.py → ...put/func_noerror_protected_meta_access.py
diff --git a/...nput/func_noerror_ugettext_lazy_format.py → ...nput/func_noerror_ugettext_lazy_format.py b/...nput/func_noerror_ugettext_lazy_format.py → ...nput/func_noerror_ugettext_lazy_format.py
diff --git a/...ut/func_noerror_unicode_py2_compatible.py → ...ut/func_noerror_unicode_py2_compatible.py b/...ut/func_noerror_unicode_py2_compatible.py → ...ut/func_noerror_unicode_py2_compatible.py
diff --git a/test/input/func_noerror_urls.py → ...t_django/tests/input/func_noerror_urls.py b/test/input/func_noerror_urls.py → ...t_django/tests/input/func_noerror_urls.py
diff --git a/test/input/func_noerror_uuid_field.py → ...go/tests/input/func_noerror_uuid_field.py b/test/input/func_noerror_uuid_field.py → ...go/tests/input/func_noerror_uuid_field.py
diff --git a/test/test_func.py → pylint_django/tests/test_func.py b/test/test_func.py → pylint_django/tests/test_func.py
@@ -8,6 +8,9 @@
 sys.path.append(os.path.join(os.path.dirname(pylint.__file__), 'test'))
 import test_functional
 
+# alter sys.path again because the tests now live as a subdirectory
+# of pylint_django
+sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..'))
 from pylint_django.compat import django_version
 
 

diff --git a/scripts/test.sh b/scripts/test.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-PYTHONPATH=. python test/test_func.py
+python pylint_django/tests/test_func.py
diff --git a/setup.py b/setup.py
@@ -5,52 +5,30 @@
 import os
 from setuptools import setup, find_packages
 
-VERSION = '0.9.1'
-PACKAGES = find_packages(exclude=[
-    '*.tests',
-    '*.tests.*',
-    'tests.*',
-    'tests',
-])
-
-SHORT_DESCRIPTION = 'A Pylint plugin to help Pylint understand the Django web framework'
-
-TRANSFORM_DIR = 'pylint_django/transforms/transforms'
-PACKAGE_DATA = {
-    'pylint_django': [
-        os.path.join('transforms/transforms', name) for name in os.listdir(TRANSFORM_DIR)
-    ]
-}
-
-CLASSIFIERS = (
-    'Development Status :: 4 - Beta',
-    'Environment :: Console',
-    'Intended Audience :: Developers',
-    'Operating System :: Unix',
-    'Topic :: Software Development :: Quality Assurance',
-    'Programming Language :: Python :: 3',
-    'Programming Language :: Python :: 3.5',
-    'Programming Language :: Python :: 3.6',
-)
-
-INSTALL_REQUIRES = [
-    'pylint-plugin-utils>=0.2.1',
-    'pylint>=1.8.2',
-]
-
 
 setup(
     name='pylint-django',
     url='https://github.com/PyCQA/pylint-django',
     author='landscape.io',
     author_email='code@landscape.io',
-    description=SHORT_DESCRIPTION,
-    version=VERSION,
-    packages=PACKAGES,
-    package_data=PACKAGE_DATA,
-    install_requires=INSTALL_REQUIRES,
+    description='A Pylint plugin to help Pylint understand the Django web framework',
+    version='0.9.2',
+    packages=find_packages(),
+    install_requires=[
+        'pylint-plugin-utils>=0.2.1',
+        'pylint>=1.8.2',
+    ],
     license='GPLv2',
-    classifiers=CLASSIFIERS,
+    classifiers=[
+        'Development Status :: 4 - Beta',
+        'Environment :: Console',
+        'Intended Audience :: Developers',
+        'Operating System :: Unix',
+        'Topic :: Software Development :: Quality Assurance',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+    ],
     keywords=['pylint', 'django', 'plugin'],
     zip_safe=False,
 )
diff --git a/tox.ini b/tox.ini
@@ -14,7 +14,7 @@ commands =
     flake8: flake8
     pylint: pylint --rcfile=tox.ini pylint_django setup
     readme: python setup.py check --restructuredtext --strict
-    py{27,34,35,36}-django{111,20}: coverage run test/test_func.py
+    py{27,34,35,36}-django{111,20}: coverage run pylint_django/tests/test_func.py
     clean: find . -type f -name '*.pyc' -delete
     clean: find . -type d -name __pycache__ -delete
     clean: rm -rf build/ .cache/ dist/ .eggs/ pylint_django.egg-info/ .tox/