Merge

luiscberrocal · Aug 24, 2021 · 34fb07d · 34fb07d
2 parents 7a9d1cb + 22dbfb3
commit 34fb07d
Show file tree

Hide file tree

Showing 36 changed files with 124 additions and 1,092 deletions.
diff --git a/.gitignore b/.gitignore
@@ -57,3 +57,5 @@ patch.diff
 \.DS_Store
 
 django_test_tools/django-test-tool\.sqlite3
+
+venv/
diff --git a/README.rst b/README.rst
@@ -132,6 +132,7 @@ For the following models
         comments = models.TextField(null=True, blank=True)
 
 
+
 running `python manage.py generate_factories example.servers > ./output/factories.py` will create the following factories
 
 .. code-block:: python

diff --git a/compose/ansible/Dockerfile b/compose/ansible/Dockerfile
diff --git a/compose/django/Dockerfile b/compose/django/Dockerfile
diff --git a/compose/django/start-dev.sh b/compose/django/start-dev.sh
diff --git a/dev.yml b/dev.yml
diff --git a/django_test_tools/__init__.py b/django_test_tools/__init__.py
@@ -1 +1 @@
-__version__ = '1.10.7'
+__version__ = '2.0.0'
diff --git a/django_test_tools/app_manager.py b/django_test_tools/app_manager.py
@@ -53,6 +53,7 @@ def _convert_field_to_dict(self, field, field_list):
         field_dict['field_name'] = field.name
         field_dict['type'] = type(field).__name__
         field_dict['unique'] = field.unique
+        field_dict['primary_key'] = field.primary_key
         field_dict['editable'] = field.editable
         if hasattr(field, 'choices') and field.choices is not None:
             field_dict['choices_type'] = type(field.choices).__name__

diff --git a/django_test_tools/flake8/__init__.py b/django_test_tools/flake8/__init__.py
diff --git a/django_test_tools/flake8/parsers.py b/django_test_tools/flake8/parsers.py
diff --git a/django_test_tools/generators/model_test_gen.py b/django_test_tools/generators/model_test_gen.py
@@ -27,19 +27,19 @@ def test_create_batch(self):
 PRINT_TEST_ATTRIBUTE_COUNT = """
     def test_attribute_count(self):
         \"\"\"
-        Test that all attributes of {0} server are counted. It will count the primary key and all editable attributes.
-        This test should break if a new attribute is added.
+        Test that all attributes of {0} server are counted. It will count the primary key and 
+        all editable attributes. This test should break if a new attribute is added.
         \"\"\"
         {1} = {0}Factory.create()
         {1}_dict = model_to_dict({1})
         self.assertEqual(len({1}_dict.keys()), {2})
-
 """
 
 PRINT_TEST_ATTRIBUTE_CONTENT = """
     def test_attribute_content(self):
         \"\"\"
-        Test that all attributes of {0} server have content. This test will break if an attributes name is changed.
+        Test that all attributes of {0} server have content. This test will break if an attributes name 
+        is changed.
         \"\"\"
         {1} = {0}Factory.create()
 """

diff --git a/django_test_tools/git/__init__.py b/django_test_tools/git/__init__.py
diff --git a/django_test_tools/git/helpers.py b/django_test_tools/git/helpers.py