From e462c7099bf2f96d4fbac679d8e545cdb1986e95 Mon Sep 17 00:00:00 2001 From: Anji Tong Date: Mon, 29 Jul 2024 01:39:52 -0400 Subject: [PATCH] New env file after updating, deprecated import fix --- environment.yml | 93 +++++++++++++++++++++++---------------------- equitytool/views.py | 2 +- 2 files changed, 49 insertions(+), 46 deletions(-) diff --git a/environment.yml b/environment.yml index db3e95f..19d157f 100644 --- a/environment.yml +++ b/environment.yml @@ -10,12 +10,12 @@ dependencies: - binutils_impl_linux-64=2.35.1=h27ae35d_9 - binutils_linux-64=2.35.1=h454624a_30 - blas=1.0=mkl - - bottleneck=1.3.5=py37h7deecbd_0 + - bottleneck=1.3.7=py38ha9d4c09_0 - bwidget=1.9.16=h9eba36c_0 - bzip2=1.0.8=h5eee18b_6 - - ca-certificates=2024.3.11=h06a4308_0 + - ca-certificates=2024.7.2=h06a4308_0 - cairo=1.16.0=hb05425b_5 - - certifi=2022.12.7=py37h06a4308_0 + - certifi=2024.7.4=py38h06a4308_0 - curl=7.69.1=hbc83047_0 - expat=2.6.2=h6a678d5_0 - fontconfig=2.14.1=h52c9d5c_1 @@ -33,8 +33,8 @@ dependencies: - gxx_linux-64=7.5.0=hffc177d_30 - harfbuzz=4.3.0=hf52aaf7_1 - icu=58.2=he6710b0_3 - - intel-openmp=2021.4.0=h06a4308_3561 - - jpeg=9e=h5eee18b_1 + - intel-openmp=2023.1.0=hdb19cb5_46306 + - jpeg=9e=h5eee18b_2 - kernel-headers_linux-64=3.10.0=h57e8cba_10 - krb5=1.17.1=h173b8e3_0 - ld_impl_linux-64=2.35.1=h7274673_9 @@ -61,26 +61,27 @@ dependencies: - libxml2=2.9.14=h74e7548_0 - lz4-c=1.9.4=h6a678d5_1 - make=4.2.1=h1bed415_1 - - mkl=2021.4.0=h06a4308_640 - - mkl-service=2.4.0=py37h7f8727e_0 - - mkl_fft=1.3.1=py37hd3c417c_0 - - mkl_random=1.2.2=py37h51133e4_0 + - mkl=2023.1.0=h213fc3f_46344 + - mkl-service=2.4.0=py38h5eee18b_1 + - mkl_fft=1.3.8=py38h5eee18b_0 + - mkl_random=1.2.4=py38hdb19cb5_0 - ncurses=6.4=h6a678d5_0 - - numexpr=2.8.4=py37he184ba9_0 - - numpy=1.21.5=py37h6c91a56_3 - - numpy-base=1.21.5=py37ha15fc14_3 + - numexpr=2.8.4=py38hc78ab66_1 + - numpy=1.24.3=py38hf6e8229_1 + - numpy-base=1.24.3=py38h060ed82_1 - openssl=1.1.1w=h7f8727e_0 - - packaging=22.0=py37h06a4308_0 - - pandas=1.3.5=py37h8c16a72_0 + - packaging=24.1=py38h06a4308_0 + - pandas=2.0.3=py38h1128e8f_0 - pango=1.50.7=h05da053_0 - pcre=8.45=h295c915_0 - pcre2=10.42=hebb0a14_1 - - pip=22.3.1=py37h06a4308_0 + - pip=24.0=py38h06a4308_0 - pixman=0.40.0=h7f8727e_1 - pyasn1=0.4.8=pyhd3eb1b0_0 - - python=3.7.16=h7a1cb2a_0 - - python-dateutil=2.8.2=pyhd3eb1b0_0 - - pytz=2022.7=py37h06a4308_0 + - python=3.8.18=h7a1cb2a_0 + - python-dateutil=2.9.0post0=py38h06a4308_2 + - python-tzdata=2023.3=pyhd3eb1b0_0 + - pytz=2024.1=py38h06a4308_0 - r-assertthat=0.2.1=r36h6115d3f_0 - r-base=3.6.1=haffb61f_2 - r-base64enc=0.1_3=r36h96ca727_4 @@ -136,44 +137,46 @@ dependencies: - r-xfun=0.6=r36h6115d3f_0 - r-yaml=2.2.0=r36h96ca727_0 - readline=8.2=h5eee18b_0 - - setuptools=65.6.3=py37h06a4308_0 + - setuptools=69.5.1=py38h06a4308_0 - six=1.16.0=pyhd3eb1b0_1 - sqlite=3.45.3=h5eee18b_0 - sysroot_linux-64=2.17=h57e8cba_10 - - tk=8.6.12=h1ccaba5_0 + - tbb=2021.8.0=hdb19cb5_0 + - tk=8.6.14=h39e8969_0 - tktable=2.10=h3d55465_1 - - wheel=0.38.4=py37h06a4308_0 + - wheel=0.43.0=py38h06a4308_0 - xz=5.4.6=h5eee18b_1 - zlib=1.2.13=h5eee18b_1 - zstd=1.5.5=hc292b87_2 - pip: - - asgiref==3.6.0 - - cffi==1.15.1 - - charset-normalizer==2.1.1 - - cryptography==39.0.2 - - dj-database-url==1.2.0 - - django==3.2.16 - - django-private-storage==3.0 - - djangorestframework==3.14.0 + - asgiref==3.8.1 + - backports-zoneinfo==0.2.1 + - cffi==1.16.0 + - charset-normalizer==3.3.2 + - cryptography==43.0.0 + - dj-database-url==2.2.0 + - django==4.2 + - django-private-storage==3.1.1 + - djangorestframework==3.15.2 - et-xmlfile==1.1.0 - - gunicorn==20.1.0 - - huey==2.4.4 - - idna==3.4 - - importlib-metadata==6.1.0 - - markdown==3.4.1 - - openpyxl==3.0.10 - - psycopg2==2.9.5 - - pycparser==2.21 - - pyopenssl==23.0.0 - - requests==2.28.1 - - sentry-sdk==1.12.1 - - sqlparse==0.4.3 - - typing-extensions==4.5.0 + - gunicorn==22.0.0 + - huey==2.5.1 + - idna==3.7 + - importlib-metadata==8.2.0 + - markdown==3.6 + - openpyxl==3.1.5 + - psycopg2==2.9.9 + - pycparser==2.22 + - pyopenssl==24.2.1 + - requests==2.32.3 + - sentry-sdk==2.11.0 + - sqlparse==0.5.1 + - typing-extensions==4.12.2 - unicodecsv==0.14.1 - - urllib3==1.26.15 + - urllib3==2.2.2 - urllib3-secure-extra==0.1.0 - - whitenoise==6.3.0 + - whitenoise==6.7.0 - xlrd==2.0.1 - xlwt==1.3.0 - - zipp==3.15.0 + - zipp==3.19.2 prefix: /opt/conda/envs/koboreports diff --git a/equitytool/views.py b/equitytool/views.py index eb61094..bc58f5c 100644 --- a/equitytool/views.py +++ b/equitytool/views.py @@ -15,7 +15,7 @@ from django.shortcuts import render from django.template import Template as DjangoTemplate, Context from django.utils.text import slugify -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.views.decorators.clickjacking import xframe_options_exempt from rest_framework import exceptions from rest_framework import status