Skip to content

BEN-2954: Rebase Django-Filer to original Repo#157

Open
andreilupuleasa wants to merge 32 commits intomaster_pbsfrom
BEN-2954
Open

BEN-2954: Rebase Django-Filer to original Repo#157
andreilupuleasa wants to merge 32 commits intomaster_pbsfrom
BEN-2954

Conversation

@andreilupuleasa
Copy link
Copy Markdown
Collaborator

No description provided.

Copilot AI and others added 30 commits April 24, 2026 10:55
- Update setup.py: require django>=5.1, remove six dependency, relax
  pinned versions for django_polymorphic and django-js-asset
- Remove six import in filer/utils/model_label.py, use str directly
- Replace force_text with force_str in admin_utils.py
- Replace ugettext_lazy with gettext_lazy in folderadmin.py
- Remove allow_tags attribute (no longer used by modern Django)
- Replace urlquote with urllib.parse.quote in foldermodels.py
- Remove use_for_related_fields from managers (removed in Django 3.0+)
- Rename __unicode__ to __str__ in models
- Replace url() with path() in test_urls.py, fix admin.site.urls usage
- Replace NoArgsCommand/option_list with BaseCommand/add_arguments
- Remove default_app_config from __init__.py
- Rename MIDDLEWARE_CLASSES to MIDDLEWARE in test_settings.py
- Update tox.ini for modern Python/Django
- Remove filer/south_migrations/ directory (South long unsupported)

Agent-Logs-Url: https://github.com/pbs/django-filer/sessions/acd29442-f148-4eca-8866-86798003b1e2

Co-authored-by: andreilupuleasa <124138251+andreilupuleasa@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
* 'BEN-3407' of github.com:pbs/django-filer:
  Potential fix for pull request finding
* master_pbs:
  Update filer/admin/common_admin.py
  BEN-3409: fix tests run
  BEN-3409: fix botocore import
  Update filer/models/filemodels.py
  Update Makefile
  Update filer/utils/cms_roles.py
  Update .github/workflows/tests.yml
  BEn-3409: use specific exception
  BEN-3409: remove python 3.14
  BEN-3409: fix unit tests
  BEN-3409: workflow_call: added
  BEN-3409: remove eolder python versions
  initial GHA file
  BEN-3409: fix filer tests
  BEN-3409: GHA branch

# Conflicts:
#	filer/storage.py
#	filer/test_settings.py
#	filer/test_urls.py
#	filer/tests/admin.py
#	setup.py
#	tox.ini
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
* 'BEN-3407' of github.com:pbs/django-filer:
  Potential fix for pull request finding
  Potential fix for pull request finding
…itions

Agent-Logs-Url: https://github.com/pbs/django-filer/sessions/cad30a66-0889-48ba-bb3e-2ab3bf2939b2

Co-authored-by: andreilupuleasa <124138251+andreilupuleasa@users.noreply.github.com>
…models, clipboardmodels, virtualitems) and settings

Agent-Logs-Url: https://github.com/pbs/django-filer/sessions/cad30a66-0889-48ba-bb3e-2ab3bf2939b2

Co-authored-by: andreilupuleasa <124138251+andreilupuleasa@users.noreply.github.com>
…ns preserved

Agent-Logs-Url: https://github.com/pbs/django-filer/sessions/cad30a66-0889-48ba-bb3e-2ab3bf2939b2

Co-authored-by: andreilupuleasa <124138251+andreilupuleasa@users.noreply.github.com>
…ilOption, FolderPermission, mime_type, etc.)

Agent-Logs-Url: https://github.com/pbs/django-filer/sessions/cad30a66-0889-48ba-bb3e-2ab3bf2939b2

Co-authored-by: andreilupuleasa <124138251+andreilupuleasa@users.noreply.github.com>
…, restore needed PBS utils

Agent-Logs-Url: https://github.com/pbs/django-filer/sessions/cad30a66-0889-48ba-bb3e-2ab3bf2939b2

Co-authored-by: andreilupuleasa <124138251+andreilupuleasa@users.noreply.github.com>
Agent-Logs-Url: https://github.com/pbs/django-filer/sessions/cad30a66-0889-48ba-bb3e-2ab3bf2939b2

Co-authored-by: andreilupuleasa <124138251+andreilupuleasa@users.noreply.github.com>
@andreilupuleasa andreilupuleasa requested a review from Copilot April 30, 2026 14:40
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot wasn't able to review this pull request because it exceeds the maximum number of lines (20,000). Try reducing the number of changed lines and requesting a review from Copilot again.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants