From 9f7fab145bfed48775aea761bd290992c13986e7 Mon Sep 17 00:00:00 2001 From: Jeremy Cloarec Date: Wed, 9 Apr 2025 12:12:51 +0200 Subject: [PATCH 1/6] [client] test drone --- requirements.txt | 1 + test-requirements.txt | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3758794c8..ca739471b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ # Filigran +wheel~=0.38 datefinder~=0.7.3 pika~=1.3.0 python-magic~=0.4.27; sys_platform == 'linux' or sys_platform == 'darwin' diff --git a/test-requirements.txt b/test-requirements.txt index 0c46614ee..99cc5a134 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,4 +8,3 @@ pytest-cov~=5.0 pytest_randomly~=3.8 types-python-dateutil>=2.8 types-pytz>=2021.3.5 -wheel~=0.38 From 1feebab36487bf3025d12a1b1073d9deed5940c3 Mon Sep 17 00:00:00 2001 From: Jeremy Cloarec Date: Wed, 9 Apr 2025 12:18:38 +0200 Subject: [PATCH 2/6] [client] test drone --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ca739471b..7332641f8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ # Filigran -wheel~=0.38 +wheel<0.46 datefinder~=0.7.3 pika~=1.3.0 python-magic~=0.4.27; sys_platform == 'linux' or sys_platform == 'darwin' From 8ecefdaf9ed6bed669e6e408bdd90642a6f28135 Mon Sep 17 00:00:00 2001 From: Jeremy Cloarec Date: Wed, 9 Apr 2025 12:25:47 +0200 Subject: [PATCH 3/6] [client] test drone --- .drone.yml | 5 +++++ ci-requirements.txt | 1 + requirements.txt | 1 - test-requirements.txt | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 ci-requirements.txt diff --git a/.drone.yml b/.drone.yml index 7c476739f..b2ad1f22e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,30 +10,35 @@ steps: - name: client-test-38 image: python:3.8 commands: + - pip3 install -r ci-requirements.txt --user - pip3 install -r requirements.txt --user - pip3 install -r test-requirements.txt --user - python3 -m pytest --no-header -vv --disable-warnings --cov=pycti --drone - name: client-test-39 image: python:3.9 commands: + - pip3 install -r ci-requirements.txt --user - pip3 install -r requirements.txt --user - pip3 install -r test-requirements.txt --user - python3 -m pytest --no-header -vv --disable-warnings --cov=pycti --drone - name: client-test-310 image: python:3.10 commands: + - pip3 install -r ci-requirements.txt --user - pip3 install -r requirements.txt --user - pip3 install -r test-requirements.txt --user - python3 -m pytest --no-header -vv --disable-warnings --cov=pycti --drone - name: client-test-311 image: python:3.11 commands: + - pip3 install -r ci-requirements.txt --user - pip3 install -r requirements.txt --user - pip3 install -r test-requirements.txt --user - python3 -m pytest --no-header -vv --disable-warnings --cov=pycti --drone - name: client-test-312 image: python:3.12 commands: + - pip3 install -r ci-requirements.txt --user - pip3 install -r requirements.txt --user - pip3 install -r test-requirements.txt --user - python3 -m pytest --no-header -vv --disable-warnings --cov=pycti --drone diff --git a/ci-requirements.txt b/ci-requirements.txt new file mode 100644 index 000000000..49e6e296b --- /dev/null +++ b/ci-requirements.txt @@ -0,0 +1 @@ +wheel<0.46 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 7332641f8..3758794c8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ # Filigran -wheel<0.46 datefinder~=0.7.3 pika~=1.3.0 python-magic~=0.4.27; sys_platform == 'linux' or sys_platform == 'darwin' diff --git a/test-requirements.txt b/test-requirements.txt index 99cc5a134..0c46614ee 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,3 +8,4 @@ pytest-cov~=5.0 pytest_randomly~=3.8 types-python-dateutil>=2.8 types-pytz>=2021.3.5 +wheel~=0.38 From d9ea8f4f4c7e426e49bfc8504f309f6eb0c5ba2c Mon Sep 17 00:00:00 2001 From: Jeremy Cloarec Date: Wed, 9 Apr 2025 14:55:01 +0200 Subject: [PATCH 4/6] [client] test drone --- .circleci/config.yml | 4 ++++ ci-requirements.txt | 2 +- requirements.txt | 2 +- setup.cfg | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 997eed1b3..135a85051 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -47,6 +47,10 @@ jobs: - image: cimg/python:3.12 steps: - checkout + - run: + name: install dependencies + command: > + pip3 install --user -r ci-requirements.txt - run: name: install dependencies command: > diff --git a/ci-requirements.txt b/ci-requirements.txt index 49e6e296b..e6ab1c8f8 100644 --- a/ci-requirements.txt +++ b/ci-requirements.txt @@ -1 +1 @@ -wheel<0.46 \ No newline at end of file +setuptools~=78.1.0 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 3758794c8..69a0bfc05 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ python_json_logger~=2.0.4 PyYAML~=6.0 pydantic>=2.8.2,<2.11 requests>=2.32.0,<=2.32.3 -setuptools~=71.1.0 +setuptools>=71.1.0,<79.0.0 cachetools~=5.5.0 prometheus-client~=0.21.1 opentelemetry-api>=1.22.0,<=1.30.0 diff --git a/setup.cfg b/setup.cfg index df1a6d005..62a50c2b7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -43,7 +43,7 @@ install_requires = python_json_logger~=2.0.4 PyYAML~=6.0 requests>=2.32.0,<=2.32.3 - setuptools~=71.1.0 + setuptools>=71.1.0,<79.0.0 cachetools~=5.5.0 prometheus-client~=0.21.1 opentelemetry-api>=1.22.0,<=1.30.0 From 8c3b4db6eddeb8ec35e0e3273523648880f0a308 Mon Sep 17 00:00:00 2001 From: Jeremy Cloarec Date: Wed, 9 Apr 2025 15:01:05 +0200 Subject: [PATCH 5/6] [client] test drone --- ci-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-requirements.txt b/ci-requirements.txt index e6ab1c8f8..63718dd74 100644 --- a/ci-requirements.txt +++ b/ci-requirements.txt @@ -1 +1 @@ -setuptools~=78.1.0 \ No newline at end of file +setuptools<=78.1.0 \ No newline at end of file From 366dafded1248b7de194d77682833eb901b6528f Mon Sep 17 00:00:00 2001 From: Jeremy Cloarec Date: Wed, 9 Apr 2025 15:04:44 +0200 Subject: [PATCH 6/6] [client] test drone --- ci-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-requirements.txt b/ci-requirements.txt index 63718dd74..dfbeefb15 100644 --- a/ci-requirements.txt +++ b/ci-requirements.txt @@ -1 +1 @@ -setuptools<=78.1.0 \ No newline at end of file +setuptools~=78.1.0; python_version >= '3.10' \ No newline at end of file