From 95cb3731c158a553f435c2278b1e5db5922392a1 Mon Sep 17 00:00:00 2001 From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com> Date: Sat, 27 Jan 2024 21:46:15 +0000 Subject: [PATCH 1/5] feat: Updated Pipfile --- Pipfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Pipfile b/Pipfile index 3906b15..00b11c3 100644 --- a/Pipfile +++ b/Pipfile @@ -4,14 +4,14 @@ verify_ssl = true name = "pypi" [requires] -python_version = "3.10" +python_version = "3.11" [packages] -Django = "*" -model-bakery = "*" -Sphinx = "*" -Pillow = "*" -tox = "*" -coverage = "*" +Django = "~=4.2" +model-bakery = "~=1.4.0" +Sphinx = "~=5.2.3" +Pillow = "~=9.2.0" +tox = "~=4.2.0" +coverage = "~=7.2.0" [dev-packages] From b1f03a06fa80b34543da3e65fd78833ee89c4f41 Mon Sep 17 00:00:00 2001 From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com> Date: Sat, 27 Jan 2024 21:49:03 +0000 Subject: [PATCH 2/5] feat: Updated Pipfile.lock --- Pipfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pipfile.lock b/Pipfile.lock index 48fe82d..c07efd1 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -5,7 +5,7 @@ }, "pipfile-spec": 6, "requires": { - "python_version": "3.10" + "python_version": "3.11" }, "sources": [ { From a836fb72b9b05f818ff23c4c3aa8508b9175d522 Mon Sep 17 00:00:00 2001 From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com> Date: Sat, 27 Jan 2024 21:52:18 +0000 Subject: [PATCH 3/5] feat: Updated setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 44fd245..45f93ba 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ url='http://github.com/ebertti/django-admin-easy/', author='Ezequiel Bertti', author_email='ebertti@gmail.com', - install_requires=['django',], + install_requires=['Django>=4.2', 'model-bakery>=1.4.0', 'Sphinx>=5.2.3', 'Pillow>=9.2.0', 'tox>=4.2.0', 'coverage>=7.2.0',], packages=find_packages(exclude=('test_app', 'test_project')), include_package_data=True, license='MIT License', From cf6b50b8fb86c5bb61b9b7b32b44a9da393f25fe Mon Sep 17 00:00:00 2001 From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com> Date: Sat, 27 Jan 2024 21:55:04 +0000 Subject: [PATCH 4/5] feat: Updated setup.py --- setup.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/setup.py b/setup.py index 45f93ba..d8265e0 100644 --- a/setup.py +++ b/setup.py @@ -25,8 +25,6 @@ 'Natural Language :: Portuguese (Brazilian)', 'Operating System :: OS Independent', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.5', - 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', From 70fb3860ee82330fc8f7847456731dad0e0fe587 Mon Sep 17 00:00:00 2001 From: "devloai[bot]" <168258904+devloai[bot]@users.noreply.github.com> Date: Sun, 15 Dec 2024 17:13:44 +0000 Subject: [PATCH 5/5] Revert setup.py changes and fix test configuration --- easy/tests.py | 9 ++++++++- setup.py | 5 +++-- test_app/urls.py | 6 ++++++ test_settings.py | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 test_app/urls.py create mode 100644 test_settings.py diff --git a/easy/tests.py b/easy/tests.py index 88901cf..adf00c8 100644 --- a/easy/tests.py +++ b/easy/tests.py @@ -1,11 +1,18 @@ import uuid import django +import os +import django +from django.conf import settings + +if not settings.configured: + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'test_settings') + django.setup() from django.contrib.admin import AdminSite from django.contrib.sessions.backends.db import SessionStore from django.http.request import HttpRequest, QueryDict from django import test -from django.utils.datetime_safe import datetime, time +from datetime import datetime, time from django.utils.safestring import SafeData from easy.six import urlencode from model_bakery import baker diff --git a/setup.py b/setup.py index d8265e0..0a99dd5 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ url='http://github.com/ebertti/django-admin-easy/', author='Ezequiel Bertti', author_email='ebertti@gmail.com', - install_requires=['Django>=4.2', 'model-bakery>=1.4.0', 'Sphinx>=5.2.3', 'Pillow>=9.2.0', 'tox>=4.2.0', 'coverage>=7.2.0',], + install_requires=['django',], packages=find_packages(exclude=('test_app', 'test_project')), include_package_data=True, license='MIT License', @@ -25,9 +25,10 @@ 'Natural Language :: Portuguese (Brazilian)', 'Operating System :: OS Independent', 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', ], diff --git a/test_app/urls.py b/test_app/urls.py new file mode 100644 index 0000000..6b669ef --- /dev/null +++ b/test_app/urls.py @@ -0,0 +1,6 @@ +from django.contrib import admin +from django.urls import path + +urlpatterns = [ + path('admin/', admin.site.urls), +] \ No newline at end of file diff --git a/test_settings.py b/test_settings.py new file mode 100644 index 0000000..560cd1a --- /dev/null +++ b/test_settings.py @@ -0,0 +1,47 @@ +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': ':memory:', + } +} + +INSTALLED_APPS = [ + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', + 'test_app', + 'easy', +] + +SECRET_KEY = 'dummy-key-for-tests' + +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +] + +ROOT_URLCONF = 'test_app.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] \ No newline at end of file