studio/blender-studio
3
4
Fork 4
Code Issues 37 Pull Requests 2 Projects 1 Releases 5 Wiki Activity

WIP: Switch between FS storage and S3 per static asset #104417

Draft
Anna Sirota wants to merge 4 commits from alternative-storage into main
pull from: alternative-storage
merge into: studio:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 4 Files Changed 7 +23 -20
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5dec292211 - Show all commits

33
requirements.txt
View File

@ -1,12 +1,13 @@
alphabetic-timestamp==1.1.5 ## The following requirements were added by pip freeze:
alphabetic_timestamp==1.1.5
appdirs==1.4.4 appdirs==1.4.4
arabic-reshaper==3.0.0 arabic-reshaper==3.0.0
asgiref==3.8.1 asgiref==3.8.1
asn1crypto==1.5.1 asn1crypto==1.5.1
attrs==19.3.0 attrs==19.3.0
babel==2.12.1 Babel==2.12.1
bleach==3.3.1 bleach==3.3.1
blender-id-oauth-client @ git+https://projects.blender.org/infrastructure/blender-id-oauth-client.git@452646e blender-id-oauth-client @ git+https://projects.blender.org/infrastructure/blender-id-oauth-client.git@452646e0742b544494f3e48ad60f5774522f4f92
boto3==1.34.130 boto3==1.34.130
botocore==1.34.130 botocore==1.34.130
braintree==4.17.1 braintree==4.17.1
@ -21,9 +22,10 @@ cryptography==42.0.8
cssselect2==0.7.0 cssselect2==0.7.0
defusedxml==0.7.1 defusedxml==0.7.1
dj-database-url==1.0.0 dj-database-url==1.0.0
Django==4.2.13
django-activity-stream==2.0.0 django-activity-stream==2.0.0
django-anymail[mailgun]==8.2 django-anymail[mailgun]==8.2
django-background-tasks-updated @ git+https://projects.blender.org/infrastructure/django-background-tasks.git@98508d6 django-background-tasks-updated @ git+https://projects.blender.org/infrastructure/django-background-tasks.git@98508d66905997925f9db399222f2264310c8e37
django-countries==7.5.1 django-countries==7.5.1
django-loginas==0.3.11 django-loginas==0.3.11
django-nested-admin==4.0.2 django-nested-admin==4.0.2
@ -31,7 +33,6 @@ django-pipeline==3.1.0
django-s3direct==2.0.3 django-s3direct==2.0.3
django-storages[google]==1.11.1 django-storages[google]==1.11.1
django-taggit==5.0.1 django-taggit==5.0.1
django==4.2.13
djangorestframework==3.14.0 djangorestframework==3.14.0
filelock==3.8.0 filelock==3.8.0
geoip2==3.0.0 geoip2==3.0.0
@ -46,16 +47,16 @@ html5lib==1.1
idna==3.4 idna==3.4
isodate==0.6.1 isodate==0.6.1
itsdangerous==2.1.2 itsdangerous==2.1.2
jinja2==2.11.3 Jinja2==2.11.3
jmespath==0.10.0 jmespath==0.10.0
jsmin==3.0.1 jsmin==3.0.1
libsass==0.22.0 libsass==0.22.0
libsasscompiler==0.1.9 libsasscompiler==0.1.9
localflavor==1.9 localflavor==1.9
looper @ git+https://projects.blender.org/infrastructure/looper.git@da42680 looper @ git+https://projects.blender.org/infrastructure/looper.git@da426807b727c6779445b40e28d2f8a447f3a1dd
lxml==4.9.2 lxml==4.9.2
markdown==3.4.1 Markdown==3.4.1
markupsafe==1.1.1 MarkupSafe==1.1.1
maxminddb==2.2.0 maxminddb==2.2.0
meilisearch==0.18.3 meilisearch==0.18.3
mistune==2.0.0a4 mistune==2.0.0a4
@ -65,13 +66,15 @@ packaging==23.0
pillow==10.3.0 pillow==10.3.0
protobuf==4.21.9 protobuf==4.21.9
psycopg2==2.9.5 psycopg2==2.9.5
pyasn1-modules==0.2.8
pyasn1==0.4.8 pyasn1==0.4.8
pyasn1-modules==0.2.8
pycountry==22.3.5 pycountry==22.3.5
pycparser==2.22
pyHanko==0.25.0
pyhanko-certvalidator==0.26.3 pyhanko-certvalidator==0.26.3
pyhanko==0.25.0
pyinstrument==4.5.3 pyinstrument==4.5.3
pymongo==3.13.0 pymongo==3.13.0
pyOpenSSL==24.1.0
pyparsing==3.0.9 pyparsing==3.0.9
pypdf==4.2.0 pypdf==4.2.0
pypng==0.20220715.0 pypng==0.20220715.0
@ -82,17 +85,16 @@ python-monkey-business==1.0.0
python-stdnum==1.18 python-stdnum==1.18
pytz==2022.7.1 pytz==2022.7.1
pyvat @ git+https://github.com/iconfinder/pyvat.git@419abd659ae5a4a6cb6ea9b54aa4bde17aefeb5b pyvat @ git+https://github.com/iconfinder/pyvat.git@419abd659ae5a4a6cb6ea9b54aa4bde17aefeb5b
pyyaml==6.0 PyYAML==6.0
qrcode==7.4.2 qrcode==7.4.2
reportlab==4.2.0 reportlab==4.2.0
requests==2.32.3
requests-file==1.5.1 requests-file==1.5.1
requests-oauthlib==1.3.1 requests-oauthlib==1.3.1
requests-toolbelt==0.10.1 requests-toolbelt==0.10.1
requests==2.32.3
rsa==4.9 rsa==4.9
s3transfer==0.10.1 s3transfer==0.10.1
sentry-sdk==1.16.0 sentry-sdk==1.16.0
setuptools==68.2.2
shortcodes==2.5.0 shortcodes==2.5.0
six==1.16.0 six==1.16.0
sorl-thumbnail==12.10.0 sorl-thumbnail==12.10.0
@ -101,7 +103,8 @@ stripe==7.1.0
svglib==1.5.1 svglib==1.5.1
tinycss2==1.3.0 tinycss2==1.3.0
tldextract==3.4.0 tldextract==3.4.0
typing-extensions==4.12.1 typing_extensions==4.12.1
tzdata==2024.1
tzlocal==5.2 tzlocal==5.2
uritools==4.0.3 uritools==4.0.3
urllib3==1.26.14 urllib3==1.26.14

10
requirements_dev.txt
View File

@ -10,17 +10,17 @@ django-stubs-ext==0.7.0
django-stubs==1.13.0 django-stubs==1.13.0
djhtml==1.4.0 djhtml==1.4.0
factory-boy==3.2.1 factory-boy==3.2.1
faker==15.3.1 Faker==15.3.1
flake8-docstrings==1.6.0
flake8==3.9.2 flake8==3.9.2
flake8-docstrings==1.6.0
freezegun==1.2.2 freezegun==1.2.2
identify==2.5.8 identify==2.5.8
ipython==7.34.0 ipython==7.34.0
jedi==0.18.1 jedi==0.18.1
matplotlib-inline==0.1.6 matplotlib-inline==0.1.6
mccabe==0.6.1 mccabe==0.6.1
mypy-extensions==0.4.3
mypy==0.990 mypy==0.990
mypy-extensions==0.4.3
nodeenv==1.7.0 nodeenv==1.7.0
parso==0.8.3 parso==0.8.3
pathspec==0.10.1 pathspec==0.10.1
@ -33,7 +33,7 @@ ptyprocess==0.7.0
pycodestyle==2.7.0 pycodestyle==2.7.0
pydocstyle==6.1.1 pydocstyle==6.1.1
pyflakes==2.3.1 pyflakes==2.3.1
pygments==2.13.0 Pygments==2.13.0
responses==0.25.3 responses==0.25.3
snowballstemmer==2.2.0 snowballstemmer==2.2.0
tblib==3.0.0 tblib==3.0.0
@ -41,6 +41,6 @@ toml==0.10.2
tomli==2.0.1 tomli==2.0.1
traitlets==5.5.0 traitlets==5.5.0
types-pytz==2022.6.0.1 types-pytz==2022.6.0.1
types-pyyaml==6.0.12.2 types-PyYAML==6.0.12.2
virtualenv==20.16.6 virtualenv==20.16.6
wcwidth==0.2.5 wcwidth==0.2.5