From d2c9a608eb064536c477272b4b12a90cfdd2cd89 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Jun 2025 22:21:47 +0000 Subject: [PATCH 1/3] Bump urllib3 from 1.26.18 to 2.5.0 Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.18 to 2.5.0. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](https://github.com/urllib3/urllib3/compare/1.26.18...2.5.0) --- updated-dependencies: - dependency-name: urllib3 dependency-version: 2.5.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index bcf838e1f..baa15e7e0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,5 +8,5 @@ tqdm==4.66.3 # boto3 (through botocore) depends on urllib3. Version 1.34.35 requires # urllib3 < 1.27 when using Python 3.9 or less, and urllib3 < 2.1 otherwise. -urllib3==1.26.18; python_version < "3.10" +urllib3==2.5.0; python_version < "3.10" urllib3==2.2.2; python_version >= "3.10" From a5547283b1d1bfc8d16d65c450c020ca0fcbbb39 Mon Sep 17 00:00:00 2001 From: Ken Kroenlein Date: Tue, 30 Sep 2025 17:14:06 -0600 Subject: [PATCH 2/3] Reconcile dependabot suggestions --- requirements.txt | 4 +- setup.py | 89 ++++++++++++++++++++------------------ src/citrine/__version__.py | 2 +- test_requirements.txt | 1 + 4 files changed, 50 insertions(+), 46 deletions(-) diff --git a/requirements.txt b/requirements.txt index baa15e7e0..ebabfb729 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,5 +8,5 @@ tqdm==4.66.3 # boto3 (through botocore) depends on urllib3. Version 1.34.35 requires # urllib3 < 1.27 when using Python 3.9 or less, and urllib3 < 2.1 otherwise. -urllib3==2.5.0; python_version < "3.10" -urllib3==2.2.2; python_version >= "3.10" +urllib3==1.26.18; python_version < "3.10" +urllib3==2.5.0; python_version >= "3.10" diff --git a/setup.py b/setup.py index d5f029112..93944c9f3 100644 --- a/setup.py +++ b/setup.py @@ -1,52 +1,55 @@ -from setuptools import setup, find_packages from os import path +from setuptools import find_packages, setup + # read the contents of your README file this_directory = path.abspath(path.dirname(__file__)) -with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f: +with open(path.join(this_directory, "README.md"), encoding="utf-8") as f: long_description = f.read() about = {} -with open(path.join(this_directory, 'src', 'citrine', '__version__.py'), 'r') as f: +with open(path.join(this_directory, "src", "citrine", "__version__.py"), "r") as f: exec(f.read(), about) -setup(name='citrine', - # Update this in src/citrine/__version__.py - version=about['__version__'], - python_requires='>=3.8', - url='http://github.com/CitrineInformatics/citrine-python', - description='Python library for the Citrine Platform', - long_description=long_description, - long_description_content_type='text/markdown', - author='Citrine Informatics', - package_dir={'': 'src'}, - packages=find_packages(where='src'), - install_requires=[ - "requests>=2.32.2,<3", - "pyjwt>=2,<3", - "arrow>=1.0.0,<2", - "gemd>=2.1.9,<3", - "boto3>=1.34.35,<2", - "deprecation>=2.1.0,<3", - "urllib3>=1.26.18,<3", - "tqdm>=4.27.0,<5", - ], - extras_require={ - "tests": [ - "factory-boy>=3.3.0,<4", - "mock>=5.1.0,<6", - "pandas>=2.0.3,<3", - "pytest>=8.0.0,<9", - "requests-mock>=1.11.0,<2", - ] - }, - classifiers=[ - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Programming Language :: Python :: 3.10', - 'Programming Language :: Python :: 3.11', - 'Programming Language :: Python :: 3.12', - 'Programming Language :: Python :: 3.13', - ], - ) +setup( + name="citrine", + # Update this in src/citrine/__version__.py + version=about["__version__"], + python_requires=">=3.8", + url="http://github.com/CitrineInformatics/citrine-python", + description="Python library for the Citrine Platform", + long_description=long_description, + long_description_content_type="text/markdown", + author="Citrine Informatics", + package_dir={"": "src"}, + packages=find_packages(where="src"), + install_requires=[ + "requests>=2.32.2,<3", + "pyjwt>=2,<3", + "arrow>=1.0.0,<2", + "gemd>=2.1.9,<3", + "boto3>=1.34.35,<2", + "deprecation>=2.1.0,<3", + "urllib3>=1.26.18,<3", + "urllib3>=2.5.0,<3; python_version < '3.10'", + "tqdm>=4.27.0,<5; python_version >= '3.10'", + ], + extras_require={ + "tests": [ + "factory-boy>=3.3.0,<4", + "mock>=5.1.0,<6", + "pandas>=2.0.3,<3", + "pytest>=8.0.0,<9", + "requests-mock>=1.11.0,<2", + ] + }, + classifiers=[ + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", + ], +) diff --git a/src/citrine/__version__.py b/src/citrine/__version__.py index e1609ca35..1d3669f91 100644 --- a/src/citrine/__version__.py +++ b/src/citrine/__version__.py @@ -1 +1 @@ -__version__ = "3.25.0" +__version__ = "3.25.1" diff --git a/test_requirements.txt b/test_requirements.txt index 17599bc63..52c85c417 100644 --- a/test_requirements.txt +++ b/test_requirements.txt @@ -6,6 +6,7 @@ mock==5.1.0 pytest==8.0.0 pytest-cov==4.1.0 requests-mock==1.11.0 +pandas>=2.0.3,<3 # faker is a dependency of factory-boy, but factory-boy sets a very low floor # for the supported version. There's a long-resolved bug revealed by using the From 613b7f46cc41eeb00c4ad58595745b3884e9f3fa Mon Sep 17 00:00:00 2001 From: Ken Kroenlein Date: Tue, 30 Sep 2025 17:17:06 -0600 Subject: [PATCH 3/3] Clerical fix --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 93944c9f3..f7ae61b91 100644 --- a/setup.py +++ b/setup.py @@ -30,9 +30,9 @@ "gemd>=2.1.9,<3", "boto3>=1.34.35,<2", "deprecation>=2.1.0,<3", - "urllib3>=1.26.18,<3", - "urllib3>=2.5.0,<3; python_version < '3.10'", - "tqdm>=4.27.0,<5; python_version >= '3.10'", + "urllib3>=1.26.18,<3; python_version < '3.10'", + "urllib3>=2.5.0,<3; python_version >= '3.10'", + "tqdm>=4.27.0,<5", ], extras_require={ "tests": [