From 4e31cfa066cc724ad184e8118b7a3cf8f4ad3849 Mon Sep 17 00:00:00 2001 From: Ryan Soley Date: Wed, 17 Sep 2025 12:48:43 -0400 Subject: [PATCH 1/7] ops: drop python 3.9 (EOL) --- .github/workflows/publish-docs.yml | 2 +- .github/workflows/test-package.yml | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml index 546cb42c..74dd68dd 100644 --- a/.github/workflows/publish-docs.yml +++ b/.github/workflows/publish-docs.yml @@ -25,7 +25,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v2 with: - python-version: '3.9' + python-version: '3.11' - name: Install pandoc uses: pandoc/actions/setup@v1 - name: Install dependencies diff --git a/.github/workflows/test-package.yml b/.github/workflows/test-package.yml index dda103be..f3e3dd2d 100644 --- a/.github/workflows/test-package.yml +++ b/.github/workflows/test-package.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.9, "3.10", "3.11"] + python-version: ["3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v4 diff --git a/setup.py b/setup.py index f0c8c7a8..f1f79944 100644 --- a/setup.py +++ b/setup.py @@ -55,7 +55,7 @@ name="DataProfiler", version=versioneer.get_version(), cmdclass=versioneer.get_cmdclass(), - python_requires=">=3.9", + python_requires=">=3.10", description=DESCRIPTION, long_description=LONG_DESCRIPTION, long_description_content_type="text/markdown", From cef2be989bca9430b4e8f5da4e57a458c133d123 Mon Sep 17 00:00:00 2001 From: Ryan Soley Date: Wed, 17 Sep 2025 13:22:48 -0400 Subject: [PATCH 2/7] ops: add whitesource config --- whitesource.config | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 whitesource.config diff --git a/whitesource.config b/whitesource.config new file mode 100644 index 00000000..1cfbc1b1 --- /dev/null +++ b/whitesource.config @@ -0,0 +1,2 @@ +python.path=python3.11 +python.pipPath=pip3.11 From 945e9e34e136e51e5349299db7480d6c7c154286 Mon Sep 17 00:00:00 2001 From: Ryan Soley Date: Thu, 18 Sep 2025 10:03:52 -0400 Subject: [PATCH 3/7] fix: don't add python 3.12 yet --- .github/workflows/test-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-package.yml b/.github/workflows/test-package.yml index f3e3dd2d..13da192a 100644 --- a/.github/workflows/test-package.yml +++ b/.github/workflows/test-package.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.10", "3.11", "3.12"] + python-version: ["3.10", "3.11"] steps: - uses: actions/checkout@v4 From 046679044b2087d1f893cd5a38be99fdace479cc Mon Sep 17 00:00:00 2001 From: Ryan Soley Date: Thu, 18 Sep 2025 10:52:18 -0400 Subject: [PATCH 4/7] ops: add whitesource config to MANIFEST --- MANIFEST.in | 1 + 1 file changed, 1 insertion(+) diff --git a/MANIFEST.in b/MANIFEST.in index e9f8fa9b..6cb4c184 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -20,6 +20,7 @@ recursive-include resources *.py recursive-include dataprofiler/labelers/embeddings *.txt include versioneer.py include dataprofiler/_version.py +include whitesource.config recursive-exclude _docs *.html recursive-exclude _docs *.cfg From 6a2cd6f41bc2ff80c443a665fc859c52702964e3 Mon Sep 17 00:00:00 2001 From: Ryan Soley Date: Thu, 18 Sep 2025 12:02:14 -0400 Subject: [PATCH 5/7] fix: remove `--forked` to fix coverage --- .github/workflows/test-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-package.yml b/.github/workflows/test-package.yml index 13da192a..47416a93 100644 --- a/.github/workflows/test-package.yml +++ b/.github/workflows/test-package.yml @@ -36,4 +36,4 @@ jobs: pre-commit run --all-files - name: Test with pytest run: | - DATAPROFILER_SEED=0 pytest --forked --cov=dataprofiler --cov-fail-under=80 + DATAPROFILER_SEED=0 pytest --cov=dataprofiler --cov-fail-under=80 From 9d8583149b66806097df32d683f92e839c1d4d93 Mon Sep 17 00:00:00 2001 From: Ryan Soley Date: Thu, 18 Sep 2025 12:17:19 -0400 Subject: [PATCH 6/7] fix: remove tests that depend on `--forked` --- dataprofiler/tests/test_data_profiler.py | 2 -- dataprofiler/tests/test_dp_logging.py | 6 ------ tox.ini | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/dataprofiler/tests/test_data_profiler.py b/dataprofiler/tests/test_data_profiler.py index 9ebdfa03..5dd12e69 100644 --- a/dataprofiler/tests/test_data_profiler.py +++ b/dataprofiler/tests/test_data_profiler.py @@ -29,8 +29,6 @@ def setUpClass(cls): def test_set_seed(self): import dataprofiler as dp - self.assertEqual(dp.settings._seed, None) - dp.set_seed(5) self.assertEqual(dp.settings._seed, 5) diff --git a/dataprofiler/tests/test_dp_logging.py b/dataprofiler/tests/test_dp_logging.py index 7f78903e..99496e31 100644 --- a/dataprofiler/tests/test_dp_logging.py +++ b/dataprofiler/tests/test_dp_logging.py @@ -22,12 +22,6 @@ def tearDownClass(cls): root_logger.removeHandler(dp_logging.get_logger()) dp_logging._dp_logger = None - def test_default_verbosity(self, mock_stdout): - # Ensure that default effective level is INFO - self.assertEqual( - logging.INFO, logging.getLogger("DataProfiler").getEffectiveLevel() - ) - def test_set_verbosity(self, mock_stdout): from dataprofiler import dp_logging diff --git a/tox.ini b/tox.ini index 4ee6081b..caf70d43 100644 --- a/tox.ini +++ b/tox.ini @@ -16,7 +16,7 @@ deps = -rrequirements-reports.txt -rrequirements-test.txt commands = - python3 -m pytest dataprofiler/tests/ --cov=dataprofiler --cov-fail-under=80 --cov-report=xml:coverage.xml --forked + python3 -m pytest dataprofiler/tests/ --cov=dataprofiler --cov-fail-under=80 --cov-report=xml:coverage.xml # add "docs" to `envlist` to run the docs build #[testenv:docs] From d476e02f6c63ca4e6633aec3d736b235fc63c86f Mon Sep 17 00:00:00 2001 From: Ryan Soley Date: Thu, 18 Sep 2025 13:02:08 -0400 Subject: [PATCH 7/7] ops: update vulnerable libraries --- requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0530826f..e32f3285 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,12 +11,12 @@ python-snappy>=0.7.1 charset-normalizer>=1.3.6 psutil>=4.0.0 scipy>=1.10.0 -requests==2.32.* +requests>=2.32.4 networkx>=2.5.1 typing-extensions>=3.10.0.2 HLL>=2.0.3 datasketches>=4.1.0 packaging>=23.0 -boto3>=1.28.61 +boto3>=1.37.15 +urllib3>=2.5.0 versioneer -# adding comment to trigger mend check