From 127bf6b520101bffee32ef07e372980811072ae7 Mon Sep 17 00:00:00 2001 From: "Annie ORourke (MU)" <100982161+aormu@users.noreply.github.com> Date: Mon, 9 Sep 2024 11:43:01 -0400 Subject: [PATCH] update supported Python version (#356) * update doc to support Python 3.10.x * update dependencies versions * Rename types.py to scuba_constants.py * Update docs/installation/DownloadAndInstall.md Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com> --------- Co-authored-by: Alden Hilton Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com> --- docs/installation/DownloadAndInstall.md | 2 +- requirements.txt | 14 +++++++------- scubagoggles/provider.py | 2 +- scubagoggles/reporter/reporter.py | 2 +- scubagoggles/{types.py => scuba_constants.py} | 0 setup.py | 16 ++++++++-------- 6 files changed, 18 insertions(+), 18 deletions(-) rename scubagoggles/{types.py => scuba_constants.py} (100%) diff --git a/docs/installation/DownloadAndInstall.md b/docs/installation/DownloadAndInstall.md index f2df1c5f..24209bdd 100644 --- a/docs/installation/DownloadAndInstall.md +++ b/docs/installation/DownloadAndInstall.md @@ -8,7 +8,7 @@ To download ScubaGoggles: 3. Extract the folder in the zip file. ## Installing Python Dependencies -Minimum required Python version to run the tool is `3.7.16`. +As of ScubaGoggles v0.3.0, the minimum required Python version to run the tool is `3.10.x`. While it's possible that ScubaGoggles may work with different versions of Python, 3.10 is the version we've tested and ensured works with the versions of the modules listed in ScubaGoggles' [dependencies](requirements.txt). ### Installing in a Virtual Environment The following commands are used to set up a python virtual environment (venv) to install the needed python dependencies. diff --git a/requirements.txt b/requirements.txt index e9af0d60..7df49f31 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ -google-api-python-client==1.7.9 -google-auth-httplib2==0.0.3 -google-auth-oauthlib==0.4.0 -MarkupSafe==2.1.1 +google-api-python-client==2.142.0 +google-auth-httplib2==0.2.0 +google-auth-oauthlib==1.2.1 +MarkupSafe==2.1.5 dnspython==2.6.1 -pandas==1.5.0 -tqdm==4.66.3 -requests==2.32.0 \ No newline at end of file +pandas==2.2.0 +tqdm==4.66.5 +requests==2.32.3 diff --git a/scubagoggles/provider.py b/scubagoggles/provider.py index a59261e5..59c23abc 100644 --- a/scubagoggles/provider.py +++ b/scubagoggles/provider.py @@ -6,7 +6,7 @@ from tqdm import tqdm from scubagoggles.utils import create_subset_inverted_dict, create_key_to_list, merge_dicts -from scubagoggles.types import ApiReference +from scubagoggles.scuba_constants import ApiReference from scubagoggles.robust_dns import RobustDNSClient EVENTS = { diff --git a/scubagoggles/reporter/reporter.py b/scubagoggles/reporter/reporter.py index 5b5c2a89..63a775b6 100644 --- a/scubagoggles/reporter/reporter.py +++ b/scubagoggles/reporter/reporter.py @@ -9,7 +9,7 @@ from datetime import datetime import pandas as pd from scubagoggles.utils import rel_abs_path -from scubagoggles.types import API_LINKS +from scubagoggles.scuba_constants import API_LINKS class Reporter: diff --git a/scubagoggles/types.py b/scubagoggles/scuba_constants.py similarity index 100% rename from scubagoggles/types.py rename to scubagoggles/scuba_constants.py diff --git a/setup.py b/setup.py index 39970014..fb5e7d92 100644 --- a/setup.py +++ b/setup.py @@ -12,16 +12,16 @@ 'scubagoggles': ['reporter/**/*'] }, include_package_data=True, - python_requires='>=3.7.16', + python_requires='>=3.10.0', install_requires=[ - 'google-api-python-client==1.7.9', - 'google-auth-httplib2==0.0.3', - 'google-auth-oauthlib==0.4.0', - 'MarkupSafe==2.1.1', + 'google-api-python-client==2.142.0', + 'google-auth-httplib2==0.2.0', + 'google-auth-oauthlib==1.2.1', + 'MarkupSafe==2.1.5', 'dnspython==2.6.1', - 'pandas==1.5.0', - 'tqdm==4.66.3', - 'requests==2.32.0' + 'pandas==2.2.0', + 'tqdm==4.66.5', + 'requests==2.32.3' ], entry_points={ 'console_scripts': ['scubagoggles=scubagoggles.main:dive']