Fix issues with test factories and pipeline tests (#1220)

Remove dependency on django_factory_boy. Make profile factories more reliable. Fixes #1181

Author: aramboi

.github/workflows/tests_build.yml renamed to .github/workflows/ci_pipeline.yml

@@ -1,4 +1,4 @@
-name: Tests Build
+name: CI Pipeline
 
 on:
  push:
@@ -12,10 +12,8 @@ on:
  - ep20*
 
 jobs:
- build:
-
- runs-on: ubuntu-18.04
-
+ tests:
+ runs-on: ubuntu-latest
  steps:
  - uses: actions/checkout@v2
  - name: Set up Python 3.6

assopy/migrations/0009_rename_assopy_user.py

@@ -1,11 +1,15 @@
-
 # Generated by Django 1.11.16 on 2018-10-27 10:51
 from __future__ import unicode_literals
+import sqlite3
 
 from django.db import migrations
 
 
 class Migration(migrations.Migration):
+ # This was added because the pipelines in Github don't have a version of
+ # SQLite>3.26 and this migration fails on versions before that.
+ if sqlite3.sqlite_version_info[1] < 27:
+ atomic = False
 
  dependencies = [
  ('assopy', '0008_remove_user_oauth_info_model'),

cms_utils/cms_plugins.py

@@ -10,4 +10,5 @@ class MarkItUpPlugin(CMSPluginBase):
  model = MarkitUpPluginModel
  render_template = 'djangocms_markitup/markitup.html'
 
+
 plugin_pool.register_plugin(MarkItUpPlugin)

cms_utils/models.py

@@ -4,4 +4,4 @@
 
 
 class MarkitUpPluginModel(CMSPlugin):
- body = MarkupField()
+ body = MarkupField()

pycon/ci_settings.py

@@ -1,4 +1,4 @@
-from pycon.settings import * # noqa
+from .test_settings import * # noqa
 
 # DEFAULT_URL_PREFIX='http://localhost:8000'
 # DEBUG=True
@@ -10,7 +10,6 @@
  }
 }
 
-
 # however for some tests we *do* want to test caches, hence we're going to use
 # @override_settings(CACHES=settings.ENABLE_LOCMEM_CACHE)
 ENABLE_LOCMEM_CACHE = {

pytest_ci.ini

@@ -1,5 +1,14 @@
 [pytest]
 DJANGO_SETTINGS_MODULE=pycon.ci_settings
+
+testpaths =
+ ./tests
+ ./common/tests
+
+python_files =
+ tests.py
+ test_*.py
+
 addopts =
  # show all except passed
  -ra

requirements-dev.in

@@ -7,7 +7,6 @@ pytest-xdist
 freezegun
 responses
 factory_boy
-django_factory_boy # consider retiring this dependency
 
 flake8
 black

requirements-dev.txt

@@ -9,82 +9,81 @@ appdirs==1.4.3 # via black
 attrs==19.3.0 # via black, pytest
 babel==2.8.0 # via django-phonenumber-field
 backcall==0.1.0 # via ipython
-black==19.10b0
+black==19.10b0 # via -r requirements-dev.in
 cairocffi==1.1.0 # via cairosvg, weasyprint
 cairosvg==2.4.2 # via weasyprint
 certifi==2019.11.28 # via requests
 cffi==1.14.0 # via cairocffi, weasyprint
 chardet==3.0.4 # via requests
 click==7.0 # via black, pip-tools
-cmsplugin-filer==1.1.3
+cmsplugin-filer==1.1.3 # via -r requirements.in
 coverage==5.0.3 # via pytest-cov
 cssselect2==0.2.2 # via cairosvg, weasyprint
-dataclasses==0.7
-decorator==4.4.1
+dataclasses==0.7 # via -r requirements.in
+decorator==4.4.2 # via -r requirements.in, ipython, traitlets
 defusedxml==0.6.0 # via cairosvg, python3-openid, social-auth-core
-dj-database-url==0.5.0
+dj-database-url==0.5.0 # via -r requirements.in
 django-appconf==1.0.3 # via cmsplugin-filer
-django-classy-tags==1.0.0
-django-cms==3.6.0
-django-crispy-forms==1.8.1
-django-extensions==2.2.8
-django-factory-boy==1.0.0
-django-filebrowser-no-grappelli==3.8.0
-django-filer==1.5.0
+django-classy-tags==1.0.0 # via -r requirements.in, django-cms, django-sekizai
+django-cms==3.6.0 # via -r requirements.in, cmsplugin-filer, djangocms-attributes-field, djangocms-grid, djangocms-text-ckeditor
+django-crispy-forms==1.9.0 # via -r requirements.in
+django-extensions==2.2.8 # via -r requirements.in
+django-filebrowser-no-grappelli==3.8.0 # via -r requirements.in
+django-filer==1.5.0 # via -r requirements.in, cmsplugin-filer
 django-formtools==2.2 # via django-cms
 django-js-asset==1.2.2 # via django-mptt
-django-markitup==3.5.0
-django-model-utils==3.1.1
+django-markitup==3.5.0 # via -r requirements.in
+django-model-utils==3.1.1 # via -r requirements.in
 django-mptt==0.11.0 # via django-filer
-django-pdb==0.6.2
-django-phonenumber-field==4.0.0
+django-pdb==0.6.2 # via -r requirements-dev.in
+django-phonenumber-field==4.0.0 # via -r requirements.in
 django-polymorphic==2.0.3 # via django-filer
 django-sekizai==1.1.0 # via cmsplugin-filer, django-cms
-django-tagging==0.4.6
-django-taggit-labels==0.6.0
-django-taggit==0.22.1
+django-tagging==0.4.6 # via -r requirements.in
+django-taggit-labels==0.6.0 # via -r requirements.in
+django-taggit==0.22.1 # via -r requirements.in, django-taggit-labels
 django-treebeard==4.3.1 # via django-cms
-django==1.11.28
-djangocms-admin-style==1.5.0
+django==1.11.28 # via -r requirements.in, cmsplugin-filer, django-appconf, django-classy-tags, django-cms, django-filer, django-formtools, django-model-utils, django-mptt, django-phonenumber-field, django-polymorphic, django-sekizai, django-treebeard, djangocms-grid, easy-thumbnails
+djangocms-admin-style==1.5.0 # via -r requirements.in, django-cms
 djangocms-attributes-field==1.2.0 # via cmsplugin-filer
-djangocms-grid==1.3.0
-djangocms-text-ckeditor==3.8.0
+djangocms-grid==1.3.0 # via -r requirements.in
+djangocms-text-ckeditor==3.9.0 # via -r requirements.in
 easy-thumbnails==2.7 # via cmsplugin-filer, django-filer
 ecdsa==0.15 # via python-jose
 entrypoints==0.3 # via flake8
 et-xmlfile==1.0.1 # via openpyxl
 execnet==1.7.1 # via pytest-xdist
-factory-boy==2.12.0
-faker==4.0.0 # via factory-boy
+factory-boy==2.12.0 # via -r requirements-dev.in
+faker==4.0.1 # via factory-boy
 fancycompleter==0.9.1 # via pdbpp
-flake8==3.7.9
-freezegun==0.3.14
-gunicorn==19.10.0
+flake8==3.7.9 # via -r requirements-dev.in
+freezegun==0.3.15 # via -r requirements-dev.in
+gunicorn==19.10.0 # via -r requirements.in
 html5lib==1.0.1 # via djangocms-text-ckeditor, weasyprint
-idna==2.8 # via requests
+idna==2.9 # via requests
 importlib-metadata==1.5.0 # via pluggy, pytest
 ipython-genutils==0.2.0 # via traitlets
-ipython==7.12.0
+ipython==7.13.0 # via -r requirements.in
 jdcal==1.4.1 # via openpyxl
 jedi==0.16.0 # via ipython
-lxml==4.5.0
-markdown2==2.3.8
+lxml==4.5.0 # via -r requirements.in
+markdown2==2.3.8 # via -r requirements.in
 mccabe==0.6.1 # via flake8
 more-itertools==8.2.0 # via pytest
 oauthlib==3.1.0 # via requests-oauthlib, social-auth-core
-openpyxl==2.4.8
+openpyxl==2.4.8 # via -r requirements.in
 packaging==20.1 # via pytest
-parso==0.6.1 # via jedi
+parso==0.6.2 # via jedi
 pathspec==0.7.0 # via black
-pdbpp==0.10.2
+pdbpp==0.10.2 # via -r requirements-dev.in
 pexpect==4.8.0 # via ipython
-phonenumbers==8.11.4
+phonenumbers==8.11.4 # via -r requirements.in
 pickleshare==0.7.5 # via ipython
 pillow==7.0.0 # via cairosvg, djangocms-text-ckeditor, easy-thumbnails
-pip-tools==4.4.1
+pip-tools==4.5.1 # via -r requirements-dev.in
 pluggy==0.13.1 # via pytest
 prompt-toolkit==3.0.3 # via ipython
-ptvsd==4.3.2
+ptvsd==4.3.2 # via -r requirements-dev.in
 ptyprocess==0.6.0 # via pexpect
 py==1.8.1 # via pytest
 pyasn1==0.4.8 # via python-jose, rsa
@@ -96,41 +95,41 @@ pyjwt==1.7.1 # via social-auth-core
 pyparsing==2.4.6 # via packaging
 pyphen==0.9.5 # via weasyprint
 pyrepl==0.9.0 # via fancycompleter
-pytest-cov==2.8.1
-pytest-django==3.8.0
+pytest-cov==2.8.1 # via -r requirements-dev.in
+pytest-django==3.8.0 # via -r requirements-dev.in
 pytest-forked==1.1.3 # via pytest-xdist
-pytest-mock==2.0.0
-pytest-xdist==1.31.0
-pytest==5.3.5
+pytest-mock==2.0.0 # via -r requirements-dev.in
+pytest-xdist==1.31.0 # via -r requirements-dev.in
+pytest==5.3.5 # via -r requirements-dev.in, pytest-cov, pytest-django, pytest-forked, pytest-mock, pytest-xdist
 python-dateutil==2.8.1 # via faker, freezegun
-python-decouple==3.3
+python-decouple==3.3 # via -r requirements.in
 python-jose==3.1.0 # via social-auth-core
-python-social-auth==0.3.6
-python3-openid==3.1.0
+python-social-auth==0.3.6 # via -r requirements.in
+python3-openid==3.1.0 # via -r requirements.in, social-auth-core
 pytz==2019.3 # via babel, django
-regex==2020.1.8  # via black
-requests-oauthlib==1.3.0
-requests==2.22.0
-responses==0.10.9
+regex==2020.2.20 # via black
+requests-oauthlib==1.3.0 # via -r requirements.in, social-auth-core
+requests==2.23.0 # via -r requirements.in, requests-oauthlib, responses, social-auth-core, stripe
+responses==0.10.11 # via -r requirements-dev.in
 rsa==4.0 # via python-jose
-shortuuid==0.5.0
+shortuuid==0.5.0 # via -r requirements.in
 six==1.14.0 # via django-appconf, django-classy-tags, django-extensions, django-filebrowser-no-grappelli, django-sekizai, ecdsa, freezegun, html5lib, packaging, pip-tools, pytest-xdist, python-dateutil, python-jose, responses, social-auth-app-django, social-auth-core, traitlets
-social-auth-app-django==3.1.0
-social-auth-core[openidconnect]==3.2.0
-stripe==2.42.0
+social-auth-app-django==3.1.0 # via -r requirements.in
+social-auth-core[openidconnect]==3.2.0 # via -r requirements.in, python-social-auth, social-auth-app-django
+stripe==2.43.0 # via -r requirements.in
 text-unidecode==1.3 # via faker
 tinycss2==1.0.2 # via cairosvg, cssselect2, weasyprint
 toml==0.10.0 # via black
 traitlets==4.3.3 # via ipython
 typed-ast==1.4.1 # via black
-unicodecsv==0.14.1
+unicodecsv==0.14.1 # via -r requirements.in
 unidecode==1.0.23 # via django-filer
 urllib3==1.25.8 # via requests
 wcwidth==0.1.8 # via prompt-toolkit, pytest
-weasyprint==51
+weasyprint==51 # via -r requirements.in
 webencodings==0.5.1 # via html5lib, tinycss2
 wmctrl==0.3 # via pdbpp
-zipp==2.2.0 # via importlib-metadata
+zipp==3.0.0 # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

requirements.txt

@@ -11,53 +11,53 @@ cairosvg==2.4.2 # via weasyprint
 certifi==2019.11.28 # via requests
 cffi==1.14.0 # via cairocffi, weasyprint
 chardet==3.0.4 # via requests
-cmsplugin-filer==1.1.3
+cmsplugin-filer==1.1.3 # via -r requirements.in
 cssselect2==0.2.2 # via cairosvg, weasyprint
-dataclasses==0.7
-decorator==4.4.1
+dataclasses==0.7 # via -r requirements.in
+decorator==4.4.2 # via -r requirements.in, ipython, traitlets
 defusedxml==0.6.0 # via cairosvg, python3-openid, social-auth-core
-dj-database-url==0.5.0
+dj-database-url==0.5.0 # via -r requirements.in
 django-appconf==1.0.3 # via cmsplugin-filer
-django-classy-tags==1.0.0
-django-cms==3.6.0
-django-crispy-forms==1.8.1
-django-extensions==2.2.8
-django-filebrowser-no-grappelli==3.8.0
-django-filer==1.5.0
+django-classy-tags==1.0.0 # via -r requirements.in, django-cms, django-sekizai
+django-cms==3.6.0 # via -r requirements.in, cmsplugin-filer, djangocms-attributes-field, djangocms-grid, djangocms-text-ckeditor
+django-crispy-forms==1.9.0 # via -r requirements.in
+django-extensions==2.2.8 # via -r requirements.in
+django-filebrowser-no-grappelli==3.8.0 # via -r requirements.in
+django-filer==1.5.0 # via -r requirements.in, cmsplugin-filer
 django-formtools==2.2 # via django-cms
 django-js-asset==1.2.2 # via django-mptt
-django-markitup==3.5.0
-django-model-utils==3.1.1
+django-markitup==3.5.0 # via -r requirements.in
+django-model-utils==3.1.1 # via -r requirements.in
 django-mptt==0.11.0 # via django-filer
-django-phonenumber-field==4.0.0
+django-phonenumber-field==4.0.0 # via -r requirements.in
 django-polymorphic==2.0.3 # via django-filer
 django-sekizai==1.1.0 # via cmsplugin-filer, django-cms
-django-tagging==0.4.6
-django-taggit-labels==0.6.0
-django-taggit==0.22.1
+django-tagging==0.4.6 # via -r requirements.in
+django-taggit-labels==0.6.0 # via -r requirements.in
+django-taggit==0.22.1 # via -r requirements.in, django-taggit-labels
 django-treebeard==4.3.1 # via django-cms
-django==1.11.28
-djangocms-admin-style==1.5.0
+django==1.11.28 # via -r requirements.in, cmsplugin-filer, django-appconf, django-classy-tags, django-cms, django-filer, django-formtools, django-model-utils, django-mptt, django-phonenumber-field, django-polymorphic, django-sekizai, django-treebeard, djangocms-grid, easy-thumbnails
+djangocms-admin-style==1.5.0 # via -r requirements.in, django-cms
 djangocms-attributes-field==1.2.0 # via cmsplugin-filer
-djangocms-grid==1.3.0
-djangocms-text-ckeditor==3.8.0
+djangocms-grid==1.3.0 # via -r requirements.in
+djangocms-text-ckeditor==3.9.0 # via -r requirements.in
 easy-thumbnails==2.7 # via cmsplugin-filer, django-filer
 ecdsa==0.15 # via python-jose
 et-xmlfile==1.0.1 # via openpyxl
-gunicorn==19.10.0
+gunicorn==19.10.0 # via -r requirements.in
 html5lib==1.0.1 # via djangocms-text-ckeditor, weasyprint
-idna==2.8 # via requests
+idna==2.9 # via requests
 ipython-genutils==0.2.0 # via traitlets
-ipython==7.12.0
+ipython==7.13.0 # via -r requirements.in
 jdcal==1.4.1 # via openpyxl
 jedi==0.16.0 # via ipython
-lxml==4.5.0
-markdown2==2.3.8
+lxml==4.5.0 # via -r requirements.in
+markdown2==2.3.8 # via -r requirements.in
 oauthlib==3.1.0 # via requests-oauthlib, social-auth-core
-openpyxl==2.4.8
-parso==0.6.1 # via jedi
+openpyxl==2.4.8 # via -r requirements.in
+parso==0.6.2 # via jedi
 pexpect==4.8.0 # via ipython
-phonenumbers==8.11.4
+phonenumbers==8.11.4 # via -r requirements.in
 pickleshare==0.7.5 # via ipython
 pillow==7.0.0 # via cairosvg, djangocms-text-ckeditor, easy-thumbnails
 prompt-toolkit==3.0.3 # via ipython
@@ -67,26 +67,26 @@ pycparser==2.19 # via cffi
 pygments==2.5.2 # via ipython
 pyjwt==1.7.1 # via social-auth-core
 pyphen==0.9.5 # via weasyprint
-python-decouple==3.3
+python-decouple==3.3 # via -r requirements.in
 python-jose==3.1.0 # via social-auth-core
-python-social-auth==0.3.6
-python3-openid==3.1.0
+python-social-auth==0.3.6 # via -r requirements.in
+python3-openid==3.1.0 # via -r requirements.in, social-auth-core
 pytz==2019.3 # via babel, django
-requests-oauthlib==1.3.0
-requests==2.22.0
+requests-oauthlib==1.3.0 # via -r requirements.in, social-auth-core
+requests==2.23.0 # via -r requirements.in, requests-oauthlib, social-auth-core, stripe
 rsa==4.0 # via python-jose
-shortuuid==0.5.0
+shortuuid==0.5.0 # via -r requirements.in
 six==1.14.0 # via django-appconf, django-classy-tags, django-extensions, django-filebrowser-no-grappelli, django-sekizai, ecdsa, html5lib, python-jose, social-auth-app-django, social-auth-core, traitlets
-social-auth-app-django==3.1.0
-social-auth-core[openidconnect]==3.2.0
-stripe==2.42.0
+social-auth-app-django==3.1.0 # via -r requirements.in
+social-auth-core[openidconnect]==3.2.0 # via -r requirements.in, python-social-auth, social-auth-app-django
+stripe==2.43.0 # via -r requirements.in
 tinycss2==1.0.2 # via cairosvg, cssselect2, weasyprint
 traitlets==4.3.3 # via ipython
-unicodecsv==0.14.1
+unicodecsv==0.14.1 # via -r requirements.in
 unidecode==1.0.23 # via django-filer
 urllib3==1.25.8 # via requests
 wcwidth==0.1.8 # via prompt-toolkit
-weasyprint==51
+weasyprint==51 # via -r requirements.in
 webencodings==0.5.1 # via html5lib, tinycss2
 
 # The following packages are considered to be unsafe in a requirements file:

setup.cfg

@@ -18,7 +18,7 @@ omit =
  */urls.py
  scripts/*
  manage.py
- pycon/wsgi.py
+ pycon/*.py
  # The exclusions below should be reviewed
  */admin.py
  conference/utils/*.py