Skip to content

Commit ca3e899

Browse files
authored
Unpin django-split-settings (ansible#15379)
* unpin django-split-settings blocker is 2 years old. upgrading to see if the previous issue is still present. upgrading to a version with Python 3.11 support * remove UPGRADE BLOCKER in README
1 parent 43a3d4a commit ca3e899

File tree

3 files changed

+2
-44
lines changed

3 files changed

+2
-44
lines changed

requirements/README.md

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -49,48 +49,6 @@ Make sure to delete the old tarball if it is an upgrade.
4949
Anything pinned in `*.in` files involves additional manual work in
5050
order to upgrade. Some information related to that work is outlined here.
5151

52-
### django-split-settings
53-
54-
When we attemed to upgrade past 1.0.0 the build process in GitHub failed on the docker build step with the following error:
55-
56-
```
57-
#19 [builder 12/12] RUN AWX_SETTINGS_FILE=/dev/null SKIP_SECRET_KEY_CHECK=yes SKIP_PG_VERSION_CHECK=yes /var/lib/awx/venv/awx/bin/awx-manage collectstatic --noinput --clear
58-
#19 sha256:cd5adb08d3aa92504348338475db9f8bb820b4f67ba5b75edf9ae7554175f1d0
59-
#19 0.725 Traceback (most recent call last):
60-
#19 0.725 File \"/var/lib/awx/venv/awx/bin/awx-manage\", line 8, in <module>
61-
#19 0.726 sys.exit(manage())
62-
#19 0.726 File \"/var/lib/awx/venv/awx/lib64/python3.9/site-packages/awx/__init__.py\", line 178, in manage
63-
#19 0.726 prepare_env()
64-
#19 0.726 File \"/var/lib/awx/venv/awx/lib64/python3.9/site-packages/awx/__init__.py\", line 133, in prepare_env
65-
#19 0.726 if not settings.DEBUG: # pragma: no cover
66-
#19 0.726 File \"/var/lib/awx/venv/awx/lib64/python3.9/site-packages/django/conf/__init__.py\", line 82, in __getattr__
67-
#19 0.726 self._setup(name)
68-
#19 0.726 File \"/var/lib/awx/venv/awx/lib64/python3.9/site-packages/django/conf/__init__.py\", line 69, in _setup
69-
#19 0.726 self._wrapped = Settings(settings_module)
70-
#19 0.726 File \"/var/lib/awx/venv/awx/lib64/python3.9/site-packages/django/conf/__init__.py\", line 170, in __init__
71-
#19 0.726 mod = importlib.import_module(self.SETTINGS_MODULE)
72-
#19 0.726 File \"/usr/lib64/python3.9/importlib/__init__.py\", line 127, in import_module
73-
#19 0.726 return _bootstrap._gcd_import(name[level:], package, level)
74-
#19 0.726 File \"<frozen importlib._bootstrap>\", line 1030, in _gcd_import
75-
#19 0.726 File \"<frozen importlib._bootstrap>\", line 1007, in _find_and_load
76-
#19 0.726 File \"<frozen importlib._bootstrap>\", line 986, in _find_and_load_unlocked
77-
#19 0.726 File \"<frozen importlib._bootstrap>\", line 680, in _load_unlocked
78-
#19 0.726 File \"<frozen importlib._bootstrap_external>\", line 850, in exec_module
79-
#19 0.726 File \"<frozen importlib._bootstrap>\", line 228, in _call_with_frames_removed
80-
#19 0.726 File \"/var/lib/awx/venv/awx/lib64/python3.9/site-packages/awx/settings/production.py\", line 74, in <module>
81-
#19 0.726 include(settings_file, optional(settings_files), scope=locals())
82-
#19 0.726 File \"/var/lib/awx/venv/awx/lib64/python3.9/site-packages/split_settings/tools.py\", line 116, in include
83-
#19 0.726 module = module_from_spec(spec) # type: ignore
84-
#19 0.726 File \"<frozen importlib._bootstrap>\", line 562, in module_from_spec
85-
#19 0.726 AttributeError: 'NoneType' object has no attribute 'loader'
86-
#19 ERROR: executor failed running [/bin/sh -c AWX_SETTINGS_FILE=/dev/null SKIP_SECRET_KEY_CHECK=yes SKIP_PG_VERSION_CHECK=yes /var/lib/awx/venv/awx/bin/awx-manage collectstatic --noinput --clear]: exit code: 1
87-
```
88-
89-
The various versions past 1.0.0 talk about adding and removing support for different python versions so there may be a mismatch in what the versions of the library support vs what is being built inside the container. Ironically, we did not experience the problem on our local containers when running `collectstatic` so we think it has something to do specifically with the build process.
90-
91-
This issue was not picked up by any existing QE testing, only when building in GitHub.
92-
93-
9452
### social-auth-app-django
9553

9654
django-social keeps a list of backends in memory that it gathers

requirements/requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ django-polymorphic
2323
django-pglocks
2424
django-radius
2525
django-solo
26-
django-split-settings==1.0.0 # We hit a strange issue where the release process errored when upgrading past 1.0.0 see UPGRADE BLOCKERS
26+
django-split-settings
2727
djangorestframework>=3.15.0
2828
djangorestframework-yaml
2929
filelock

requirements/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ django-radius==1.5.1
162162
# via -r /awx_devel/requirements/requirements.in
163163
django-solo==2.2.0
164164
# via -r /awx_devel/requirements/requirements.in
165-
django-split-settings==1.0.0
165+
django-split-settings==1.3.2
166166
# via
167167
# -r /awx_devel/requirements/requirements.in
168168
# django-ansible-base

0 commit comments

Comments
 (0)