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

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

@@ -15,6 +15,14 @@ Unreleased
 ----------
 
 =========================
+[5.5.1] - 2024-01-10
+---------------------
+  * Added retry mechanism for failed report deliveries.
+
+[5.5.0] - 2023-10-19
+---------------------
+  * Add data export timestamp
+
 [5.4.1] - 2023-09-22
 ---------------------
   * Update NullBooleanField for Django 4.2 support

{edx-enterprise-data-5.4.1/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.4.1
+Version: 5.5.1
 Summary: Enterprise Reporting
 Home-page: https://github.com/openedx/edx-enterprise-data
 Author: edX
@@ -31,8 +31,8 @@ Requires-Dist: awscli; extra == "reporting"
 Requires-Dist: boto3; extra == "reporting"
 Requires-Dist: celery==4.4.7; extra == "reporting"
 Requires-Dist: cryptography; extra == "reporting"
+Requires-Dist: https; extra == "reporting"
 Requires-Dist: paramiko; extra == "reporting"
-Requires-Dist: py2neo; extra == "reporting"
 Requires-Dist: pyminizip; extra == "reporting"
 Requires-Dist: snowflake-connector-python; extra == "reporting"
 Requires-Dist: unicodecsv==0.14.1; extra == "reporting"

{edx-enterprise-data-5.4.1 → 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.4.1
+Version: 5.5.1
 Summary: Enterprise Reporting
 Home-page: https://github.com/openedx/edx-enterprise-data
 Author: edX
@@ -31,8 +31,8 @@ Requires-Dist: awscli; extra == "reporting"
 Requires-Dist: boto3; extra == "reporting"
 Requires-Dist: celery==4.4.7; extra == "reporting"
 Requires-Dist: cryptography; extra == "reporting"
+Requires-Dist: https; extra == "reporting"
 Requires-Dist: paramiko; extra == "reporting"
-Requires-Dist: py2neo; extra == "reporting"
 Requires-Dist: pyminizip; extra == "reporting"
 Requires-Dist: snowflake-connector-python; extra == "reporting"
 Requires-Dist: unicodecsv==0.14.1; extra == "reporting"

{edx-enterprise-data-5.4.1 → edx-enterprise-data-5.5.1}/edx_enterprise_data.egg-info/SOURCES.txt

@@ -84,6 +84,7 @@ enterprise_data/migrations/0034_auto_20230907_0834.py
 enterprise_data/migrations/0035_auto_20230907_1154.py
 enterprise_data/migrations/0036_enterprisesubsidybudget_subsidy_access_policy_display_name.py
 enterprise_data/migrations/0037_alter_enterpriseenrollment_consent_granted.py
+enterprise_data/migrations/0038_enterpriseoffer_export_timestamp.py
 enterprise_data/migrations/__init__.py
 enterprise_data/settings/__init__.py
 enterprise_data/settings/test.py

{edx-enterprise-data-5.4.1 → edx-enterprise-data-5.5.1}/edx_enterprise_data.egg-info/requires.txt

@@ -17,8 +17,8 @@ awscli
 boto3
 celery==4.4.7
 cryptography
+https
 paramiko
-py2neo
 pyminizip
 snowflake-connector-python
 unicodecsv==0.14.1

{edx-enterprise-data-5.4.1 → 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.4.1"
+__version__ = "5.5.1"

edx-enterprise-data-5.5.1/enterprise_data/migrations/0038_enterpriseoffer_export_timestamp.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.20 on 2023-10-19 15:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('enterprise_data', '0037_alter_enterpriseenrollment_consent_granted'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='enterpriseoffer',
+            name='export_timestamp',
+            field=models.DateTimeField(null=True),
+        ),
+    ]

{edx-enterprise-data-5.4.1 → edx-enterprise-data-5.5.1}/enterprise_data/models.py

@@ -310,6 +310,7 @@ class EnterpriseOffer(models.Model):
     remaining_balance = models.FloatField(null=True)
     amount_offer_spent_ocm = models.FloatField(null=True)
     amount_offer_spent_exec_ed = models.FloatField(null=True)
+    export_timestamp = models.DateTimeField(null=True)
 
     def __str__(self):
         """

{edx-enterprise-data-5.4.1 → 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.4.1 → 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.53
+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.53
+boto3==1.28.74
     # via -r requirements/reporting.in
-botocore==1.31.53
+botocore==1.31.74
     # via
     #   awscli
     #   boto3
@@ -32,12 +32,12 @@ certifi==2023.7.22
     #   py2neo
     #   requests
     #   snowflake-connector-python
-cffi==1.15.1
+cffi==1.16.0
     # via
     #   cryptography
     #   pynacl
     #   snowflake-connector-python
-charset-normalizer==3.2.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
@@ -54,7 +54,7 @@ cryptography==41.0.4
     #   pyjwt
     #   pyopenssl
     #   snowflake-connector-python
-django==3.2.21
+django==3.2.22
     # via
     #   -c requirements/common_constraints.txt
     #   -r requirements/base.in
@@ -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.6.2
+faker==19.12.0
     # via factory-boy
-filelock==3.12.4
+filelock==3.13.1
     # via snowflake-connector-python
 idna==3.4
     # via
@@ -129,11 +129,11 @@ kombu==4.6.11
     # via celery
 monotonic==1.6
     # via py2neo
-newrelic==9.0.0
+newrelic==9.1.1
     # via edx-django-utils
 oscrypto==1.3.0
     # via snowflake-connector-python
-packaging==23.1
+packaging==23.2
     # via
     #   py2neo
     #   snowflake-connector-python
@@ -145,11 +145,11 @@ pbr==5.11.1
     # via stevedore
 pgpy==0.6.0
     # via -r requirements/reporting.in
-platformdirs==3.8.1
+platformdirs==3.11.0
     # via snowflake-connector-python
-psutil==5.9.5
+psutil==5.9.6
     # via edx-django-utils
-py2neo==2021.2.3
+py2neo @ https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-2021.2.3.tar.gz
     # via -r requirements/reporting.in
 pyasn1==0.5.0
     # via
@@ -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
@@ -202,7 +202,7 @@ rsa==4.7.2
     # via awscli
 rules==3.3
     # via -r requirements/base.in
-s3transfer==0.6.2
+s3transfer==0.7.0
     # via
     #   awscli
     #   boto3
@@ -218,7 +218,7 @@ six==1.16.0
     #   vertica-python
 slumber==0.7.1
     # via edx-rest-api-client
-snowflake-connector-python==3.2.0
+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.16
+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.4.1 → edx-enterprise-data-5.5.1}/requirements/ci.txt

@@ -4,17 +4,17 @@
 #
 #    make upgrade
 #
-coverage==7.3.1
+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
-packaging==23.1
+packaging==23.2
     # via tox
-platformdirs==3.10.0
+platformdirs==3.11.0
     # via virtualenv
 pluggy==1.3.0
     # via tox
@@ -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.4.1 → 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.7
+astroid==3.0.1
     # via
     #   pylint
     #   pylint-celery
-awscli==1.29.53
+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.53
+boto3==1.28.74
     # via -r requirements/reporting.in
-botocore==1.31.53
+botocore==1.31.74
     # via
     #   awscli
     #   boto3
@@ -38,14 +38,14 @@ certifi==2023.7.22
     #   py2neo
     #   requests
     #   snowflake-connector-python
-cffi==1.15.1
+cffi==1.16.0
     # via
     #   cryptography
     #   pynacl
     #   snowflake-connector-python
 chardet==5.2.0
     # via diff-cover
-charset-normalizer==3.2.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,14 +70,15 @@ 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
 distlib==0.3.7
     # via virtualenv
-django==3.2.21
+django==3.2.22
     # via
     #   -c requirements/common_constraints.txt
     #   -r requirements/base.in
@@ -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.2.0
+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.6.2
+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,8 @@ 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
     # via rich
 markupsafe==2.1.3
@@ -195,13 +200,13 @@ monotonic==1.6
     # via py2neo
 more-itertools==10.1.0
     # via jaraco-classes
-newrelic==9.0.0
+newrelic==9.1.1
     # via edx-django-utils
 nh3==0.2.14
     # via readme-renderer
 oscrypto==1.3.0
     # via snowflake-connector-python
-packaging==23.1
+packaging==23.2
     # via
     #   build
     #   py2neo
@@ -221,7 +226,7 @@ pip-tools==7.3.0
     # via -r requirements/dev-enterprise_data.in
 pkginfo==1.9.6
     # via twine
-platformdirs==3.8.1
+platformdirs==3.11.0
     # via
     #   pylint
     #   snowflake-connector-python
@@ -232,17 +237,17 @@ 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
-py2neo==2021.2.3
+py2neo @ https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-2021.2.3.tar.gz
     # via -r requirements/reporting.in
 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
@@ -262,7 +267,7 @@ pyjwt[crypto]==2.8.0
     #   edx-drf-extensions
     #   edx-rest-api-client
     #   snowflake-connector-python
-pylint==2.17.5
+pylint==3.0.2
     # via
     #   edx-lint
     #   pylint-celery
@@ -270,7 +275,7 @@ pylint==2.17.5
     #   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
@@ -284,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
@@ -322,16 +327,18 @@ requests-toolbelt==1.0.0
     # via twine
 rfc3986==2.0.0
     # via twine
-rich==13.5.3
+rich==13.6.0
     # via twine
 rsa==4.7.2
     # via awscli
 rules==3.3
     # via -r requirements/base.in
-s3transfer==0.6.2
+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
@@ -348,7 +355,7 @@ slumber==0.7.1
     # via edx-rest-api-client
 snowballstemmer==2.2.0
     # via pydocstyle
-snowflake-connector-python==3.2.0
+snowflake-connector-python==3.3.1
     # via -r requirements/reporting.in
 sortedcontainers==2.4.0
     # via snowflake-connector-python
@@ -359,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
@@ -379,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
@@ -395,27 +399,25 @@ typing-extensions==4.8.0
     #   snowflake-connector-python
 unicodecsv==0.14.1
     # via -r requirements/reporting.in
-urllib3==1.26.16
+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.1
+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.1/requirements/django.txt

@@ -0,0 +1 @@
+django==3.2.22

{edx-enterprise-data-5.4.1 → 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.4.1 → edx-enterprise-data-5.5.1}/requirements/pip_tools.txt

@@ -10,7 +10,7 @@ click==8.1.7
     # via pip-tools
 importlib-metadata==6.8.0
     # via build
-packaging==23.1
+packaging==23.2
     # via build
 pip-tools==7.3.0
     # via -r requirements/pip_tools.in
@@ -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