Skip to content

Commit

Permalink
update dependencies for production and development, update emanifest …
Browse files Browse the repository at this point in the history
…URL in test (#580)
  • Loading branch information
dpgraham4401 authored Aug 28, 2023
1 parent a00eb33 commit 1e51324
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion server/apps/trak/tests/services/test_handler_services.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def test_pulls_site_details_from_rcrainfo(self, mock_responses):
# Arrange
rcrainfo = RcrainfoService(api_username=self.user.username, auto_renew=False)
handler_service = RcraSiteService(username=self.user.username, rcrainfo=rcrainfo)
rcrainfo_site_details_url = f"{rcrainfo.base_url}/api/v1/site-details/{self.epa_id}"
rcrainfo_site_details_url = f"{rcrainfo.base_url}v1/site-details/{self.epa_id}"
# mock response from Rcrainfo
mock_responses.get(
rcrainfo_site_details_url,
Expand Down
4 changes: 2 additions & 2 deletions server/apps/trak/tests/services/test_manifest_services.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def manifest_100033134elc_rcra_response(self, haztrak_json, mock_responses):
rcrainfo = RcrainfoService(api_username="testuser1", rcrainfo_env="preprod")
manifest_json = haztrak_json.MANIFEST.value
mock_responses.get(
url=f'{rcrainfo.base_url}/api/v1/emanifest/manifest/{manifest_json.get("manifestTrackingNumber")}',
url=f'{rcrainfo.base_url}v1/emanifest/manifest/{manifest_json.get("manifestTrackingNumber")}',
content_type="application/json",
json=manifest_json,
status=status.HTTP_200_OK,
Expand All @@ -34,7 +34,7 @@ def manifest_100033134elc_rcra_response(self, haztrak_json, mock_responses):
def search_site_mtn_rcra_response(self, haztrak_json, mock_responses):
rcrainfo = RcrainfoService(api_username="testuser1", rcrainfo_env="preprod")
mock_responses.post(
url=f"{rcrainfo.base_url}/api/v1/emanifest/search",
url=f"{rcrainfo.base_url}v1/emanifest/search",
content_type="application/json",
json=[haztrak_json.MANIFEST.value.get("manifestTrackingNumber")],
status=status.HTTP_200_OK,
Expand Down
4 changes: 2 additions & 2 deletions server/apps/trak/tests/services/test_rcrainfo_services.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def test_gets_credentials_correctly(self, mock_responses):
"""Test our overridden retrieve_id() and retrieve_key() function as expected"""
rcrainfo = RcrainfoService(api_username=self.testuser1.username)
auth_url = (
f"{rcrainfo.base_url}/api/v1/auth/{self.profile.rcra_api_id}/"
f"{rcrainfo.base_url}v1/auth/{self.profile.rcra_api_id}/"
f"{self.profile.rcra_api_key}"
)
mock_token = "thisIsAMockToken"
Expand Down Expand Up @@ -68,7 +68,7 @@ def _setup(self, user_factory, rcra_profile_factory, quicker_sign_response_facto
self.testuser1 = user_factory()
self.profile = rcra_profile_factory(user=self.testuser1)
self.rcrainfo = RcrainfoService(api_username=self.testuser1.username, auto_renew=False)
self.quicker_sign_url = f"{self.rcrainfo.base_url}/api/v1/emanifest/manifest/quicker-sign"
self.quicker_sign_url = f"{self.rcrainfo.base_url}v1/emanifest/manifest/quicker-sign"
self.response_json = quicker_sign_response_factory(
mtn=self.mtn, site_id=self.site_id, sign_date=self.sign_date
)
Expand Down
20 changes: 10 additions & 10 deletions server/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
asgiref==3.7.2
Django==4.2.3
Django==4.2.4
django-celery-results==2.5.1
django-cors-headers==4.0.0
django-extensions==3.2.1
django-cors-headers==4.2.0
django-extensions==3.2.3
django-celery-beat==2.5.0
djangorestframework==3.14.0
gunicorn==20.1.0
emanifest==3.0.5
psycopg[binary]==3.1.9
gunicorn==21.2.0
emanifest==4.0.0
psycopg[binary]==3.1.10
pytz==2023.3
sqlparse==0.4.4
tzdata==2023.3
whitenoise==6.4.0
celery==5.2.7
redis==4.5.5
drf-spectacular==0.26.2
whitenoise==6.5.0
celery==5.3.1
redis==5.0.0
drf-spectacular==0.26.4
12 changes: 6 additions & 6 deletions server/requirements_dev.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
pytest-mock==3.10.0
pre-commit==3.3.2
pytest==7.3.1
pytest-mock==3.11.1
pre-commit==3.3.3
pytest==7.4.0
pytest-django==4.5.2
responses==0.23.1
ruff==0.0.270
black==23.3.0
responses==0.23.3
ruff==0.0.286
black==23.7.0
-r requirements.txt

0 comments on commit 1e51324

Please sign in to comment.