[ci] migration of client-python repository (#12446) (#13170)

2025-12-22 08:17:08 +00:00 · 2025-11-14 17:07:55 +01:00
parent 17dc3ee0c9
commit 12c78d8527
4 changed files with 14 additions and 15 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -176,7 +176,7 @@ jobs:
          at: ~/
      - run:
          name: Replace pycti requirement of stable version with latest master branch code
-          command: find . -name requirements.txt -exec sed 's|^pycti==.*$|pycti @ git+https://github.com/OpenCTI-Platform/client-python@master|' -i {} \;
+          command: find . -name requirements.txt -exec sed 's|^pycti==.*$|pycti @ git+https://github.com/OpenCTI-Platform/opencti@master#subdirectory=client-python|' -i {} \;
      - run:
          working_directory: ~/opencti/opencti-platform/opencti-graphql
          command: yarn install
@@ -205,7 +205,7 @@ jobs:
          at: ~/
      - run:
          name: Replace pycti requirement of stable version with latest prerelease branch code
-          command: find . -name requirements.txt -exec sed "s|^pycti==.*$|pycti @ git+https://github.com/OpenCTI-Platform/client-python@$CIRCLE_BRANCH|" -i {} \;          
+          command: find . -name requirements.txt -exec sed "s|^pycti==.*$|pycti @ git+https://github.com/OpenCTI-Platform/opencti@$CIRCLE_BRANCH#subdirectory=client-python|" -i {} \;          
      - run:
          working_directory: ~/opencti/opencti-platform/opencti-graphql
          command: yarn install
@@ -260,7 +260,7 @@ jobs:
          at: ~/
      - run:
          name: Replace pycti requirement of stable version with latest master branch code
-          command: find . -name requirements.txt -exec sed 's|^pycti==.*$|pycti @ git+https://github.com/OpenCTI-Platform/client-python@master|' -i {} \;          
+          command: find . -name requirements.txt -exec sed 's|^pycti==.*$|pycti @ git+https://github.com/OpenCTI-Platform/opencti.git@master#subdirectory=client-python|' -i {} \;          
      - run:
          working_directory: ~/opencti_musl/opencti-platform/opencti-graphql
          command: yarn install
@@ -289,7 +289,7 @@ jobs:
          at: ~/
      - run:
          name: Replace pycti requirement of stable version with latest prerelease branch code
-          command: find . -name requirements.txt -exec sed "s|^pycti==.*$|pycti @ git+https://github.com/OpenCTI-Platform/client-python@$CIRCLE_BRANCH|" -i {} \;                    
+          command: find . -name requirements.txt -exec sed "s|^pycti==.*$|pycti @ git+https://github.com/OpenCTI-Platform/opencti.git@$CIRCLE_BRANCH#subdirectory=client-python|" -i {} \;                    
      - run:
          working_directory: ~/opencti_musl/opencti-platform/opencti-graphql
          command: yarn install
@@ -318,7 +318,6 @@ jobs:
      - run: cp -a ./opencti-platform/opencti-graphql release/opencti
      - run: cp -a ./opencti-platform/.yarnrc.yml release/opencti/
      - run: cp -a ./opencti-worker/src release/opencti/worker
-      - run: cd release/opencti && git clone --single-branch --branch ${CIRCLE_TAG} https://github.com/OpenCTI-Platform/client-python
      - run: cd release/opencti && git clone --single-branch --branch ${CIRCLE_TAG} https://github.com/OpenCTI-Platform/connectors
      - run:
          working_directory: ~/opencti/release
@@ -398,7 +397,6 @@ jobs:
      - run: cp -a ./opencti-platform/opencti-graphql release/opencti
      - run: cp -a ./opencti-platform/.yarnrc.yml release/opencti/
      - run: cp -a ./opencti-worker/src release/opencti/worker
-      - run: cd release/opencti && git clone --single-branch --branch ${CIRCLE_TAG} https://github.com/OpenCTI-Platform/client-python
      - run: cd release/opencti && git clone --single-branch --branch ${CIRCLE_TAG} https://github.com/OpenCTI-Platform/connectors
      - run:
          working_directory: ~/opencti_musl/release
@@ -600,7 +598,7 @@ jobs:
      - run: sudo apt-get update -qq && sudo apt install curl
      - run:
          name: Replace pycti requirement of stable version with latest master branch code
-          command: find . -name requirements.txt -exec sed 's|^pycti==.*$|pycti @ git+https://github.com/OpenCTI-Platform/client-python@master|' -i {} \;
+          command: find . -name requirements.txt -exec sed 's|^pycti==.*$|pycti @ git+https://github.com/OpenCTI-Platform/opencti.git@master#subdirectory=client-python|' -i {} \;
      - run:
          name: Install buildx
          command: |
@@ -645,7 +643,7 @@ jobs:
      - run: sudo apt-get update -qq && sudo apt install curl
      - run:
          name: Replace pycti requirement of stable version with latest master branch code
-          command: find . -name requirements.txt -exec sed 's|^pycti==.*$|pycti @ git+https://github.com/OpenCTI-Platform/client-python@master|' -i {} \;
+          command: find . -name requirements.txt -exec sed 's|^pycti==.*$|pycti @ git+https://github.com/OpenCTI-Platform/opencti.git@master#subdirectory=client-python|' -i {} \;
      - run:
          name: Install buildx
          command: |
@@ -689,7 +687,7 @@ jobs:
      - run: sudo apt-get update -qq && sudo apt install curl
      - run:
          name: Replace pycti requirement of stable version with latest prerelease branch code
-          command: find . -name requirements.txt -exec sed "s|^pycti==.*$|pycti @ git+https://github.com/OpenCTI-Platform/client-python@$CIRCLE_BRANCH|" -i {} \;
+          command: find . -name requirements.txt -exec sed "s|^pycti==.*$|pycti @ git+https://github.com/OpenCTI-Platform/opencti.git@$CIRCLE_BRANCH#subdirectory=client-python|" -i {} \;
      - run:
          name: Install buildx
          command: |
@@ -734,7 +732,7 @@ jobs:
      - run: sudo apt-get update -qq && sudo apt install curl
      - run:
          name: Replace pycti requirement of stable version with latest release branch code
-          command: find . -name requirements.txt -exec sed "s|^pycti==.*$|pycti @ git+https://github.com/OpenCTI-Platform/client-python@$CIRCLE_BRANCH|" -i {} \;
+          command: find . -name requirements.txt -exec sed "s|^pycti==.*$|pycti @ git+https://github.com/OpenCTI-Platform/opencti.git@$CIRCLE_BRANCH#subdirectory=client-python|" -i {} \;
      - run:
          name: Install buildx
          command: |
@@ -778,7 +776,7 @@ jobs:
      - run: sudo apt-get update -qq && sudo apt install curl
      - run:
          name: Replace pycti requirement of stable version with latest master branch code
-          command: find . -name requirements.txt -exec sed 's|^pycti==.*$|pycti @ git+https://github.com/OpenCTI-Platform/client-python@master|' -i {} \;      
+          command: find . -name requirements.txt -exec sed 's|^pycti==.*$|pycti @ git+https://github.com/OpenCTI-Platform/opencti.git@master#subdirectory=client-python|' -i {} \;      
      - run:
          name: Install buildx
          command: |
@@ -823,7 +821,7 @@ jobs:
      - run: sudo apt-get update -qq && sudo apt install curl
      - run:
          name: Replace pycti requirement of stable version with latest master branch code
-          command: find . -name requirements.txt -exec sed 's|^pycti==.*$|pycti @ git+https://github.com/OpenCTI-Platform/client-python@master|' -i {} \;      
+          command: find . -name requirements.txt -exec sed 's|^pycti==.*$|pycti @ git+https://github.com/OpenCTI-Platform/opencti.git.git@master#subdirectory=client-python|' -i {} \;      
      - run:
          name: Install buildx
          command: |
--- a/.devcontainer/install.dependencies.sh
+++ b/.devcontainer/install.dependencies.sh
@@ -8,4 +8,5 @@ yarn install
 yarn install:python

 echo -e "\n\nInstalling OpenCTI Python client ...\n"
-pip install 'git+https://github.com/OpenCTI-Platform/client-python@master'
+cd /opencti/client-python
+pip install -r requirements.txt
--- a/client-python/setup.cfg
+++ b/client-python/setup.cfg
@@ -4,7 +4,7 @@ version = attr: pycti.__version__
 author = Filigran
 author_email = contact@filigran.io
 maintainer = Filigran
-url = https://github.com/OpenCTI-Platform/client-python
+url = https://github.com/OpenCTI-Platform/opencti
 description = Python API client for OpenCTI.
 long_description = file: README.md
 long_description_content_type = text/markdown
--- a/opencti-platform/Dockerfile
+++ b/opencti-platform/Dockerfile
@@ -66,7 +66,7 @@ RUN pip3 install --no-cache-dir --requirement ./src/python/requirements.txt \
    && pip3 install \
        --no-cache-dir \
        --upgrade \
-        --force 'git+https://github.com/OpenCTI-Platform/client-python@master' \
+        --force 'git+https://github.com/OpenCTI-Platform/opencti@master#subdirectory=client-python' \
    && apk del git gcc musl-dev

 COPY --from=graphql-deps-builder /opt/opencti-build/opencti-graphql/node_modules ./node_modules