Merge pull request #138 from Brown-University-Library/upgrade_django

upgrades django and improves requirements

requirements/base.in

@@ -1,9 +1,18 @@
-Django==3.2.15
-django-dotenv
-django-crispy-forms
-django-model-utils
-django-import-export
-bdrxml
-django-shibboleth-remoteuser>=0.12
+## third-part packages
+django-crispy-forms~=1.11.0
+django-dotenv~=1.4.0
+django-import-export~=2.5.0
+django-model-utils~=4.1.1
+Django~=3.2.0
+
+## required for one of the builds
+setuptools~=75.3.0
+
+pip~=24.3.1
+requests~=2.26.0
+uv~=0.5.8
+
+## fixed local versions
+bdrxml==1.4
+django-shibboleth-remoteuser==0.12
 django-bulstyle @ https://github.com/Brown-University-Library/django-bulstyle/archive/v1.3.zip#sha1=1986f817a2bede2a13e49e1a1b817067d9c9c04f
-requests

requirements/base.txt

@@ -1,28 +1,24 @@
-#
-# This file is autogenerated by pip-compile with python 3.9
-# To update, run:
-#
-#    pip-compile ./requirements/base.in
-#
-asgiref==3.3.4
+# This file was autogenerated by uv via the following command:
+#    uv pip compile ./requirements/base.in --output-file ./requirements/base.txt --universal --python 3.8
+asgiref==3.8.1
     # via django
 bdrxml==1.4
     # via -r ./requirements/base.in
-certifi==2020.12.5
+certifi==2024.8.30
     # via requests
-charset-normalizer==2.0.3
+charset-normalizer==2.0.12
     # via requests
 defusedxml==0.7.1
     # via odfpy
-diff-match-patch==20200713
+diff-match-patch==20241021
     # via django-import-export
-django==3.2.15
+django==3.2.25
     # via
     #   -r ./requirements/base.in
     #   django-bootstrap3
     #   django-import-export
     #   django-model-utils
-django-bootstrap3==15.0.0
+django-bootstrap3==23.6
     # via django-bulstyle
 django-bulstyle @ https://github.com/Brown-University-Library/django-bulstyle/archive/v1.3.zip#sha1=1986f817a2bede2a13e49e1a1b817067d9c9c04f
     # via -r ./requirements/base.in
@@ -36,50 +32,51 @@ django-model-utils==4.1.1
     # via -r ./requirements/base.in
 django-shibboleth-remoteuser==0.12
     # via -r ./requirements/base.in
-et-xmlfile==1.1.0
+et-xmlfile==2.0.0
     # via openpyxl
 eulxml==1.1.3
     # via bdrxml
-idna==2.10
+idna==3.10
     # via requests
-isodate==0.6.0
+isodate==0.7.2 ; python_full_version < '3.11'
     # via rdflib
-lxml==4.7.1
+lxml==5.3.0
     # via eulxml
-markuppy==1.14
-    # via tablib
 odfpy==1.4.1
     # via tablib
-openpyxl==3.0.7
+openpyxl==3.1.5
     # via tablib
+pip==24.3.1
+    # via -r ./requirements/base.in
 ply==3.8
     # via
     #   bdrxml
     #   eulxml
-pyparsing==2.4.7
+pyparsing==3.1.4
     # via rdflib
-pytz==2021.1
+pytz==2024.2
     # via django
-pyyaml==5.4.1
+pyyaml==6.0.2
     # via tablib
-rdflib==6.0.0
+rdflib==7.1.1
     # via bdrxml
 requests==2.26.0
     # via -r ./requirements/base.in
-six==1.16.0
-    # via
-    #   eulxml
-    #   isodate
-sqlparse==0.4.2
+setuptools==75.3.0
+    # via -r ./requirements/base.in
+six==1.17.0
+    # via eulxml
+sqlparse==0.5.3
     # via django
-tablib[html,ods,xls,xlsx,yaml]==3.0.0
+tablib==3.6.1
     # via django-import-export
-urllib3==1.26.7
+typing-extensions==4.12.2 ; python_full_version < '3.11'
+    # via asgiref
+urllib3==1.26.20
     # via requests
+uv==0.5.8
+    # via -r ./requirements/base.in
 xlrd==2.0.1
     # via tablib
 xlwt==1.3.0
     # via tablib
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools

requirements/local.in

@@ -0,0 +1,2 @@
+-r base.txt
+responses==0.23.0

requirements/production.in

@@ -0,0 +1,2 @@
+-r base.txt
+mysqlclient~=2.1.0

requirements/production.txt

@@ -1,2 +1,133 @@
--r base.txt
-./requirements/mysqlclient-2.0.3-cp38-cp38-linux_x86_64.whl
+# This file was autogenerated by uv via the following command:
+#    uv pip compile ./requirements/production.in --output-file ./requirements/production.txt --universal --python 3.8
+asgiref==3.8.1
+    # via
+    #   -r ./requirements/base.txt
+    #   django
+bdrxml==1.4
+    # via -r ./requirements/base.txt
+certifi==2024.8.30
+    # via
+    #   -r ./requirements/base.txt
+    #   requests
+charset-normalizer==2.0.12
+    # via
+    #   -r ./requirements/base.txt
+    #   requests
+defusedxml==0.7.1
+    # via
+    #   -r ./requirements/base.txt
+    #   odfpy
+diff-match-patch==20241021
+    # via
+    #   -r ./requirements/base.txt
+    #   django-import-export
+django==3.2.25
+    # via
+    #   -r ./requirements/base.txt
+    #   django-bootstrap3
+    #   django-import-export
+    #   django-model-utils
+django-bootstrap3==23.6
+    # via
+    #   -r ./requirements/base.txt
+    #   django-bulstyle
+django-bulstyle @ https://github.com/Brown-University-Library/django-bulstyle/archive/v1.3.zip#sha1=1986f817a2bede2a13e49e1a1b817067d9c9c04f
+    # via -r ./requirements/base.txt
+django-crispy-forms==1.11.2
+    # via -r ./requirements/base.txt
+django-dotenv==1.4.2
+    # via -r ./requirements/base.txt
+django-import-export==2.5.0
+    # via -r ./requirements/base.txt
+django-model-utils==4.1.1
+    # via -r ./requirements/base.txt
+django-shibboleth-remoteuser==0.12
+    # via -r ./requirements/base.txt
+et-xmlfile==2.0.0
+    # via
+    #   -r ./requirements/base.txt
+    #   openpyxl
+eulxml==1.1.3
+    # via
+    #   -r ./requirements/base.txt
+    #   bdrxml
+idna==3.10
+    # via
+    #   -r ./requirements/base.txt
+    #   requests
+isodate==0.7.2 ; python_full_version < '3.11'
+    # via
+    #   -r ./requirements/base.txt
+    #   rdflib
+lxml==5.3.0
+    # via
+    #   -r ./requirements/base.txt
+    #   eulxml
+mysqlclient==2.1.1
+    # via -r ./requirements/production.in
+odfpy==1.4.1
+    # via
+    #   -r ./requirements/base.txt
+    #   tablib
+openpyxl==3.1.5
+    # via
+    #   -r ./requirements/base.txt
+    #   tablib
+pip==24.3.1
+    # via -r ./requirements/base.txt
+ply==3.8
+    # via
+    #   -r ./requirements/base.txt
+    #   bdrxml
+    #   eulxml
+pyparsing==3.1.4
+    # via
+    #   -r ./requirements/base.txt
+    #   rdflib
+pytz==2024.2
+    # via
+    #   -r ./requirements/base.txt
+    #   django
+pyyaml==6.0.2
+    # via
+    #   -r ./requirements/base.txt
+    #   tablib
+rdflib==7.1.1
+    # via
+    #   -r ./requirements/base.txt
+    #   bdrxml
+requests==2.26.0
+    # via -r ./requirements/base.txt
+setuptools==75.3.0
+    # via -r ./requirements/base.txt
+six==1.17.0
+    # via
+    #   -r ./requirements/base.txt
+    #   eulxml
+sqlparse==0.5.3
+    # via
+    #   -r ./requirements/base.txt
+    #   django
+tablib==3.6.1
+    # via
+    #   -r ./requirements/base.txt
+    #   django-import-export
+typing-extensions==4.12.2 ; python_full_version < '3.11'
+    # via
+    #   -r ./requirements/base.txt
+    #   asgiref
+urllib3==1.26.20
+    # via
+    #   -r ./requirements/base.txt
+    #   requests
+uv==0.5.8
+    # via -r ./requirements/base.txt
+xlrd==2.0.1
+    # via
+    #   -r ./requirements/base.txt
+    #   tablib
+xlwt==1.3.0
+    # via
+    #   -r ./requirements/base.txt
+    #   tablib

requirements/staging.in

@@ -0,0 +1,8 @@
+-r base.txt
+
+## for django sqlite hack
+pysqlite3~=0.5.4
+pysqlite3-binary~=0.5.4
+
+mysqlclient~=2.1.0
+responses==0.23.0