edx-enterprise-data 5.5.0__tar.gz → 5.5.1__tar.gz

{edx-enterprise-data-5.5.0 → edx-enterprise-data-5.5.1}/CHANGELOG.rst

@@ -15,6 +15,10 @@ Unreleased
 ----------
 
 =========================
+[5.5.1] - 2024-01-10
+---------------------
+  * Added retry mechanism for failed report deliveries.
+
 [5.5.0] - 2023-10-19
 ---------------------
   * Add data export timestamp

{edx-enterprise-data-5.5.0/edx_enterprise_data.egg-info → edx-enterprise-data-5.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edx-enterprise-data
-Version: 5.5.0
+Version: 5.5.1
 Summary: Enterprise Reporting
 Home-page: https://github.com/openedx/edx-enterprise-data
 Author: edX

{edx-enterprise-data-5.5.0 → edx-enterprise-data-5.5.1/edx_enterprise_data.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edx-enterprise-data
-Version: 5.5.0
+Version: 5.5.1
 Summary: Enterprise Reporting
 Home-page: https://github.com/openedx/edx-enterprise-data
 Author: edX

{edx-enterprise-data-5.5.0 → edx-enterprise-data-5.5.1}/enterprise_data/__init__.py

@@ -2,4 +2,4 @@
 Enterprise data api application. This Django app exposes API endpoints used by enterprises.
 """
 
-__version__ = "5.5.0"
+__version__ = "5.5.1"

{edx-enterprise-data-5.5.0 → edx-enterprise-data-5.5.1}/enterprise_reporting/reporter.py

@@ -20,7 +20,12 @@ from enterprise_reporting.clients.enterprise import (
 from enterprise_reporting.clients.s3 import S3Client
 from enterprise_reporting.clients.vertica import VerticaClient
 from enterprise_reporting.delivery_method import SFTPDeliveryMethod, SMTPDeliveryMethod
-from enterprise_reporting.utils import decrypt_string, extract_catalog_uuids_from_reporting_config, generate_data
+from enterprise_reporting.utils import (
+    decrypt_string,
+    extract_catalog_uuids_from_reporting_config,
+    generate_data,
+    retry_on_exception,
+)
 
 LOGGER = logging.getLogger(__name__)
 NOW = datetime.datetime.now().strftime("%Y-%m-%d")
@@ -115,6 +120,7 @@ class EnterpriseReportSender:
         """Get a full path to the report file that can be modified with arbitrary formatting."""
         return '_{}.'.join(self.data_report_file_name.rsplit('.'))
 
+    @retry_on_exception(max_retries=2, delay=1, backoff=2)
     def send_enterprise_report(self):
         """Generate the report file of the appropriate type and send it through the configured delivery method."""
         LOGGER.info(f'Starting process to send report to {self.enterprise_customer_name}')

{edx-enterprise-data-5.5.0 → edx-enterprise-data-5.5.1}/requirements/base.txt

@@ -12,15 +12,15 @@ asn1crypto==1.5.1
     # via
     #   oscrypto
     #   snowflake-connector-python
-awscli==1.29.62
+awscli==1.29.74
     # via -r requirements/reporting.in
 bcrypt==4.0.1
     # via paramiko
 billiard==3.6.4.0
     # via celery
-boto3==1.28.62
+boto3==1.28.74
     # via -r requirements/reporting.in
-botocore==1.31.62
+botocore==1.31.74
     # via
     #   awscli
     #   boto3
@@ -37,7 +37,7 @@ cffi==1.16.0
     #   cryptography
     #   pynacl
     #   snowflake-connector-python
-charset-normalizer==3.3.0
+charset-normalizer==3.3.1
     # via
     #   requests
     #   snowflake-connector-python
@@ -45,7 +45,7 @@ click==8.1.7
     # via edx-django-utils
 colorama==0.4.4
     # via awscli
-cryptography==41.0.4
+cryptography==41.0.5
     # via
     #   -r requirements/reporting.in
     #   django-fernet-fields-v2
@@ -97,7 +97,7 @@ edx-django-utils==5.7.0
     #   -r requirements/base.in
     #   edx-drf-extensions
     #   edx-rest-api-client
-edx-drf-extensions==8.10.0
+edx-drf-extensions==8.12.0
     # via
     #   -r requirements/base.in
     #   edx-rbac
@@ -107,13 +107,13 @@ edx-opaque-keys==2.5.1
     #   edx-drf-extensions
 edx-rbac==1.8.0
     # via -r requirements/base.in
-edx-rest-api-client==5.6.0
+edx-rest-api-client==5.6.1
     # via -r requirements/base.in
 factory-boy==3.3.0
     # via -r requirements/base.in
-faker==19.8.0
+faker==19.12.0
     # via factory-boy
-filelock==3.12.4
+filelock==3.13.1
     # via snowflake-connector-python
 idna==3.4
     # via
@@ -129,7 +129,7 @@ kombu==4.6.11
     # via celery
 monotonic==1.6
     # via py2neo
-newrelic==9.1.0
+newrelic==9.1.1
     # via edx-django-utils
 oscrypto==1.3.0
     # via snowflake-connector-python
@@ -147,7 +147,7 @@ pgpy==0.6.0
     # via -r requirements/reporting.in
 platformdirs==3.11.0
     # via snowflake-connector-python
-psutil==5.9.5
+psutil==5.9.6
     # via edx-django-utils
 py2neo @ https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-2021.2.3.tar.gz
     # via -r requirements/reporting.in
@@ -175,7 +175,7 @@ pynacl==1.5.0
     # via
     #   edx-django-utils
     #   paramiko
-pyopenssl==23.2.0
+pyopenssl==23.3.0
     # via snowflake-connector-python
 python-dateutil==2.8.2
     # via
@@ -218,7 +218,7 @@ six==1.16.0
     #   vertica-python
 slumber==0.7.1
     # via edx-rest-api-client
-snowflake-connector-python==3.2.1
+snowflake-connector-python==3.3.1
     # via -r requirements/reporting.in
 sortedcontainers==2.4.0
     # via snowflake-connector-python
@@ -238,13 +238,13 @@ typing-extensions==4.8.0
     #   snowflake-connector-python
 unicodecsv==0.14.1
     # via -r requirements/reporting.in
-urllib3==1.26.17
+urllib3==1.26.18
     # via
     #   botocore
     #   py2neo
     #   requests
     #   snowflake-connector-python
-vertica-python==1.3.5
+vertica-python==1.3.6
     # via -r requirements/reporting.in
 vine==1.3.0
     # via

{edx-enterprise-data-5.5.0 → edx-enterprise-data-5.5.1}/requirements/ci.txt

@@ -8,7 +8,7 @@ coverage==7.3.2
     # via -r requirements/ci.in
 distlib==0.3.7
     # via virtualenv
-filelock==3.12.4
+filelock==3.13.1
     # via
     #   tox
     #   virtualenv
@@ -29,8 +29,5 @@ tox==3.28.0
     #   -c requirements/common_constraints.txt
     #   -c requirements/constraints.txt
     #   -r requirements/ci.in
-    #   tox-battery
-tox-battery==0.6.2
-    # via -r requirements/ci.in
-virtualenv==20.24.5
+virtualenv==20.24.6
     # via tox

{edx-enterprise-data-5.5.0 → edx-enterprise-data-5.5.1}/requirements/dev.txt

@@ -12,19 +12,19 @@ asn1crypto==1.5.1
     # via
     #   oscrypto
     #   snowflake-connector-python
-astroid==2.15.8
+astroid==3.0.1
     # via
     #   pylint
     #   pylint-celery
-awscli==1.29.62
+awscli==1.29.74
     # via -r requirements/reporting.in
 bcrypt==4.0.1
     # via paramiko
 billiard==3.6.4.0
     # via celery
-boto3==1.28.62
+boto3==1.28.74
     # via -r requirements/reporting.in
-botocore==1.31.62
+botocore==1.31.74
     # via
     #   awscli
     #   boto3
@@ -45,7 +45,7 @@ cffi==1.16.0
     #   snowflake-connector-python
 chardet==5.2.0
     # via diff-cover
-charset-normalizer==3.3.0
+charset-normalizer==3.3.1
     # via
     #   requests
     #   snowflake-connector-python
@@ -62,7 +62,7 @@ code-annotations==1.5.0
     # via edx-lint
 colorama==0.4.4
     # via awscli
-cryptography==41.0.4
+cryptography==41.0.5
     # via
     #   -r requirements/reporting.in
     #   django-fernet-fields-v2
@@ -70,8 +70,9 @@ cryptography==41.0.4
     #   pgpy
     #   pyjwt
     #   pyopenssl
+    #   secretstorage
     #   snowflake-connector-python
-diff-cover==7.7.0
+diff-cover==8.0.0
     # via -r requirements/dev-enterprise_data.in
 dill==0.3.7
     # via pylint
@@ -123,13 +124,13 @@ edx-django-utils==5.7.0
     #   -r requirements/base.in
     #   edx-drf-extensions
     #   edx-rest-api-client
-edx-drf-extensions==8.10.0
+edx-drf-extensions==8.12.0
     # via
     #   -r requirements/base.in
     #   edx-rbac
 edx-i18n-tools==1.3.0
     # via -r requirements/dev-enterprise_data.in
-edx-lint==5.3.4
+edx-lint==5.3.6
     # via
     #   -r requirements/dev-enterprise_data.in
     #   -r requirements/quality.in
@@ -139,13 +140,13 @@ edx-opaque-keys==2.5.1
     #   edx-drf-extensions
 edx-rbac==1.8.0
     # via -r requirements/base.in
-edx-rest-api-client==5.6.0
+edx-rest-api-client==5.6.1
     # via -r requirements/base.in
 factory-boy==3.3.0
     # via -r requirements/base.in
-faker==19.8.0
+faker==19.12.0
     # via factory-boy
-filelock==3.12.4
+filelock==3.13.1
     # via
     #   snowflake-connector-python
     #   tox
@@ -169,6 +170,10 @@ isort==5.12.0
     #   pylint
 jaraco-classes==3.3.0
     # via keyring
+jeepney==0.8.0
+    # via
+    #   keyring
+    #   secretstorage
 jinja2==3.1.2
     # via
     #   code-annotations
@@ -181,8 +186,6 @@ keyring==24.2.0
     # via twine
 kombu==4.6.11
     # via celery
-lazy-object-proxy==1.9.0
-    # via astroid
 lxml==4.9.3
     # via edx-i18n-tools
 markdown-it-py==3.0.0
@@ -197,7 +200,7 @@ monotonic==1.6
     # via py2neo
 more-itertools==10.1.0
     # via jaraco-classes
-newrelic==9.1.0
+newrelic==9.1.1
     # via edx-django-utils
 nh3==0.2.14
     # via readme-renderer
@@ -234,7 +237,7 @@ pluggy==1.3.0
     #   tox
 polib==1.2.0
     # via edx-i18n-tools
-psutil==5.9.5
+psutil==5.9.6
     # via edx-django-utils
 py==1.11.0
     # via tox
@@ -244,7 +247,7 @@ pyasn1==0.5.0
     # via
     #   pgpy
     #   rsa
-pycodestyle==2.11.0
+pycodestyle==2.11.1
     # via -r requirements/quality.in
 pycparser==2.21
     # via cffi
@@ -264,7 +267,7 @@ pyjwt[crypto]==2.8.0
     #   edx-drf-extensions
     #   edx-rest-api-client
     #   snowflake-connector-python
-pylint==2.17.7
+pylint==3.0.2
     # via
     #   edx-lint
     #   pylint-celery
@@ -272,7 +275,7 @@ pylint==2.17.7
     #   pylint-plugin-utils
 pylint-celery==0.3
     # via edx-lint
-pylint-django==2.5.3
+pylint-django==2.5.5
     # via edx-lint
 pylint-plugin-utils==0.8.2
     # via
@@ -286,7 +289,7 @@ pynacl==1.5.0
     # via
     #   edx-django-utils
     #   paramiko
-pyopenssl==23.2.0
+pyopenssl==23.3.0
     # via snowflake-connector-python
 pyproject-hooks==1.0.0
     # via build
@@ -334,6 +337,8 @@ s3transfer==0.7.0
     # via
     #   awscli
     #   boto3
+secretstorage==3.3.3
+    # via keyring
 semantic-version==2.10.0
     # via edx-drf-extensions
 six==1.16.0
@@ -350,7 +355,7 @@ slumber==0.7.1
     # via edx-rest-api-client
 snowballstemmer==2.2.0
     # via pydocstyle
-snowflake-connector-python==3.2.1
+snowflake-connector-python==3.3.1
     # via -r requirements/reporting.in
 sortedcontainers==2.4.0
     # via snowflake-connector-python
@@ -361,7 +366,7 @@ stevedore==5.1.0
     #   code-annotations
     #   edx-django-utils
     #   edx-opaque-keys
-testfixtures==7.2.0
+testfixtures==7.2.2
     # via -r requirements/quality.in
 text-unidecode==1.3
     # via python-slugify
@@ -381,9 +386,6 @@ tox==3.28.0
     #   -c requirements/common_constraints.txt
     #   -c requirements/constraints.txt
     #   -r requirements/dev-enterprise_data.in
-    #   tox-battery
-tox-battery==0.6.2
-    # via -r requirements/dev-enterprise_data.in
 twine==4.0.2
     # via -r requirements/dev-enterprise_data.in
 typing-extensions==4.8.0
@@ -397,27 +399,25 @@ typing-extensions==4.8.0
     #   snowflake-connector-python
 unicodecsv==0.14.1
     # via -r requirements/reporting.in
-urllib3==1.26.17
+urllib3==1.26.18
     # via
     #   botocore
     #   py2neo
     #   requests
     #   snowflake-connector-python
     #   twine
-vertica-python==1.3.5
+vertica-python==1.3.6
     # via -r requirements/reporting.in
 vine==1.3.0
     # via
     #   amqp
     #   celery
-virtualenv==20.24.5
+virtualenv==20.24.6
     # via tox
-wheel==0.41.2
+wheel==0.41.3
     # via
     #   -r requirements/dev-enterprise_data.in
     #   pip-tools
-wrapt==1.15.0
-    # via astroid
 zipp==3.17.0
     # via
     #   importlib-metadata

{edx-enterprise-data-5.5.0 → edx-enterprise-data-5.5.1}/requirements/pip.txt

@@ -4,11 +4,11 @@
 #
 #    make upgrade
 #
-wheel==0.41.2
+wheel==0.41.3
     # via -r requirements/pip.in
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==23.2.1
+pip==23.3.1
     # via -r requirements/pip.in
 setuptools==68.2.2
     # via -r requirements/pip.in

{edx-enterprise-data-5.5.0 → edx-enterprise-data-5.5.1}/requirements/pip_tools.txt

@@ -21,7 +21,7 @@ tomli==2.0.1
     #   build
     #   pip-tools
     #   pyproject-hooks
-wheel==0.41.2
+wheel==0.41.3
     # via pip-tools
 zipp==3.17.0
     # via importlib-metadata

{edx-enterprise-data-5.5.0 → edx-enterprise-data-5.5.1}/requirements/quality.txt

@@ -12,19 +12,19 @@ asn1crypto==1.5.1
     # via
     #   oscrypto
     #   snowflake-connector-python
-astroid==2.15.8
+astroid==3.0.1
     # via
     #   pylint
     #   pylint-celery
-awscli==1.29.62
+awscli==1.29.74
     # via -r requirements/reporting.in
 bcrypt==4.0.1
     # via paramiko
 billiard==3.6.4.0
     # via celery
-boto3==1.28.62
+boto3==1.28.74
     # via -r requirements/reporting.in
-botocore==1.31.62
+botocore==1.31.74
     # via
     #   awscli
     #   boto3
@@ -45,7 +45,7 @@ cffi==1.16.0
     #   snowflake-connector-python
 chardet==5.2.0
     # via diff-cover
-charset-normalizer==3.3.0
+charset-normalizer==3.3.1
     # via
     #   requests
     #   snowflake-connector-python
@@ -63,8 +63,10 @@ code-annotations==1.5.0
 colorama==0.4.4
     # via awscli
 coverage[toml]==7.3.2
-    # via pytest-cov
-cryptography==41.0.4
+    # via
+    #   coverage
+    #   pytest-cov
+cryptography==41.0.5
     # via
     #   -r requirements/reporting.in
     #   django-fernet-fields-v2
@@ -72,10 +74,11 @@ cryptography==41.0.4
     #   pgpy
     #   pyjwt
     #   pyopenssl
+    #   secretstorage
     #   snowflake-connector-python
 ddt==1.6.0
     # via -r requirements/test.in
-diff-cover==7.7.0
+diff-cover==8.0.0
     # via -r requirements/dev-enterprise_data.in
 dill==0.3.7
     # via pylint
@@ -128,13 +131,13 @@ edx-django-utils==5.7.0
     #   -r requirements/base.in
     #   edx-drf-extensions
     #   edx-rest-api-client
-edx-drf-extensions==8.10.0
+edx-drf-extensions==8.12.0
     # via
     #   -r requirements/base.in
     #   edx-rbac
 edx-i18n-tools==1.3.0
     # via -r requirements/dev-enterprise_data.in
-edx-lint==5.3.4
+edx-lint==5.3.6
     # via
     #   -r requirements/dev-enterprise_data.in
     #   -r requirements/quality.in
@@ -144,7 +147,7 @@ edx-opaque-keys==2.5.1
     #   edx-drf-extensions
 edx-rbac==1.8.0
     # via -r requirements/base.in
-edx-rest-api-client==5.6.0
+edx-rest-api-client==5.6.1
     # via -r requirements/base.in
 exceptiongroup==1.1.3
     # via pytest
@@ -152,9 +155,9 @@ factory-boy==3.3.0
     # via
     #   -r requirements/base.in
     #   -r requirements/test.in
-faker==19.8.0
+faker==19.12.0
     # via factory-boy
-filelock==3.12.4
+filelock==3.13.1
     # via
     #   snowflake-connector-python
     #   tox
@@ -184,6 +187,10 @@ isort==5.12.0
     #   pylint
 jaraco-classes==3.3.0
     # via keyring
+jeepney==0.8.0
+    # via
+    #   keyring
+    #   secretstorage
 jinja2==3.1.2
     # via
     #   code-annotations
@@ -196,8 +203,6 @@ keyring==24.2.0
     # via twine
 kombu==4.6.11
     # via celery
-lazy-object-proxy==1.9.0
-    # via astroid
 lxml==4.9.3
     # via edx-i18n-tools
 markdown-it-py==3.0.0
@@ -214,7 +219,7 @@ monotonic==1.6
     # via py2neo
 more-itertools==10.1.0
     # via jaraco-classes
-newrelic==9.1.0
+newrelic==9.1.1
     # via edx-django-utils
 nh3==0.2.14
     # via readme-renderer
@@ -253,7 +258,7 @@ pluggy==1.3.0
     #   tox
 polib==1.2.0
     # via edx-i18n-tools
-psutil==5.9.5
+psutil==5.9.6
     # via edx-django-utils
 py==1.11.0
     # via tox
@@ -263,7 +268,7 @@ pyasn1==0.5.0
     # via
     #   pgpy
     #   rsa
-pycodestyle==2.11.0
+pycodestyle==2.11.1
     # via -r requirements/quality.in
 pycparser==2.21
     # via cffi
@@ -283,7 +288,7 @@ pyjwt[crypto]==2.8.0
     #   edx-drf-extensions
     #   edx-rest-api-client
     #   snowflake-connector-python
-pylint==2.17.7
+pylint==3.0.2
     # via
     #   edx-lint
     #   pylint-celery
@@ -291,7 +296,7 @@ pylint==2.17.7
     #   pylint-plugin-utils
 pylint-celery==0.3
     # via edx-lint
-pylint-django==2.5.3
+pylint-django==2.5.5
     # via edx-lint
 pylint-plugin-utils==0.8.2
     # via
@@ -305,17 +310,17 @@ pynacl==1.5.0
     # via
     #   edx-django-utils
     #   paramiko
-pyopenssl==23.2.0
+pyopenssl==23.3.0
     # via snowflake-connector-python
 pyproject-hooks==1.0.0
     # via build
-pytest==7.4.2
+pytest==7.4.3
     # via
     #   pytest-cov
     #   pytest-django
 pytest-cov==4.1.0
     # via -r requirements/test.in
-pytest-django==4.5.2
+pytest-django==4.6.0
     # via -r requirements/test.in
 python-dateutil==2.8.2
     # via
@@ -366,6 +371,8 @@ s3transfer==0.7.0
     # via
     #   awscli
     #   boto3
+secretstorage==3.3.3
+    # via keyring
 semantic-version==2.10.0
     # via edx-drf-extensions
 six==1.16.0
@@ -382,7 +389,7 @@ slumber==0.7.1
     # via edx-rest-api-client
 snowballstemmer==2.2.0
     # via pydocstyle
-snowflake-connector-python==3.2.1
+snowflake-connector-python==3.3.1
     # via -r requirements/reporting.in
 sortedcontainers==2.4.0
     # via snowflake-connector-python
@@ -393,7 +400,7 @@ stevedore==5.1.0
     #   code-annotations
     #   edx-django-utils
     #   edx-opaque-keys
-testfixtures==7.2.0
+testfixtures==7.2.2
     # via
     #   -r requirements/quality.in
     #   -r requirements/test.in
@@ -417,9 +424,6 @@ tox==3.28.0
     #   -c requirements/common_constraints.txt
     #   -c requirements/constraints.txt
     #   -r requirements/dev-enterprise_data.in
-    #   tox-battery
-tox-battery==0.6.2
-    # via -r requirements/dev-enterprise_data.in
 twine==4.0.2
     # via -r requirements/dev-enterprise_data.in
 types-pyyaml==6.0.12.12
@@ -435,7 +439,7 @@ typing-extensions==4.8.0
     #   snowflake-connector-python
 unicodecsv==0.14.1
     # via -r requirements/reporting.in
-urllib3==1.26.17
+urllib3==1.26.18
     # via
     #   botocore
     #   py2neo
@@ -443,20 +447,18 @@ urllib3==1.26.17
     #   responses
     #   snowflake-connector-python
     #   twine
-vertica-python==1.3.5
+vertica-python==1.3.6
     # via -r requirements/reporting.in
 vine==1.3.0
     # via
     #   amqp
     #   celery
-virtualenv==20.24.5
+virtualenv==20.24.6
     # via tox
-wheel==0.41.2
+wheel==0.41.3
     # via
     #   -r requirements/dev-enterprise_data.in
     #   pip-tools
-wrapt==1.15.0
-    # via astroid
 zipp==3.17.0
     # via
     #   importlib-metadata