From 73ecd112374d0ab525c208421137dee872377578 Mon Sep 17 00:00:00 2001
From: Sasha Romijn <github@mxsasha.eu>
Date: Tue, 16 Jan 2024 11:52:19 +0100
Subject: [PATCH] [4.3.x] Fix CI issues

---
 .circleci/config.yml | 20 +++++++++++++++-----
 requirements.txt     |  6 ++++++
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4031374a9..60673c5cf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -99,19 +99,24 @@ commands:
             echo
 
       - run:
-          name: Installing psql client, enchant, netcat, rust
-          command: $SUDO apt -y install postgresql-client netcat python3-enchant rustc
+          name: Installing psql client, enchant, netcat
+          command: $SUDO apt -y install postgresql-client netcat python3-enchant python3-venv python3-dev
+
+      - run:
+          name: Installing rust
+          command: $SUDO curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 
       - restore_cache:
           keys:
-            - v23-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum
+            - v24-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum
               "requirements.txt" }}
             # fallback to using the latest cache if no exact match is found
-            - v23-dependencies-{{ .Environment.CIRCLE_JOB }}
+            - v24-dependencies-{{ .Environment.CIRCLE_JOB }}
 
       - run:
           name: install latest pip
           command: |
+            rm -rf venv
             $PYTHON_INTERPRETER -m venv venv
             . venv/bin/activate
             pip install -U pip
@@ -119,6 +124,7 @@ commands:
       - run:
           name: install dependencies
           command: |
+            rm -rf venv
             PATH=$PATH:/root/.cargo/bin/
             $PYTHON_INTERPRETER -m venv venv
             . venv/bin/activate
@@ -127,7 +133,7 @@ commands:
       - save_cache:
           paths:
             - ./venv
-          key: v23-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum
+          key: v24-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum
             "requirements.txt" }}
 
   wait_for_postgres:
@@ -200,6 +206,7 @@ jobs:
           IRRD_REDIS_URL: 'redis://localhost'
           PYTHON_INTERPRETER: python3
           SUDO: sudo
+          PATH: /root/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
       - image: cimg/postgres:<< parameters.postgres_version >>
         environment:
@@ -236,6 +243,7 @@ jobs:
           IRRD_REDIS_URL: 'redis://localhost'
           PYTHON_INTERPRETER: pypy3
           SUDO: ''
+          PATH: /root/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
       - image: cimg/postgres:<< parameters.postgres_version >>
         environment:
@@ -274,6 +282,7 @@ jobs:
           IRRD_REDIS_URL_INTEGRATION_2: 'redis://localhost/5'
           PYTHON_INTERPRETER: python3
           SUDO: sudo
+          PATH: /root/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
       - image: cimg/postgres:<< parameters.postgres_version >>
         environment:
@@ -313,6 +322,7 @@ jobs:
           IRRD_REDIS_URL_INTEGRATION_2: 'redis://localhost/5'
           PYTHON_INTERPRETER: pypy3
           SUDO: ''
+          PATH: /root/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
       - image: cimg/postgres:<< parameters.postgres_version >>
         environment:
diff --git a/requirements.txt b/requirements.txt
index 237ed7882..b961a6766 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -48,11 +48,17 @@ pytest-asyncio==0.20.3
 freezegun==1.2.2
 pytest-freezegun==0.4.2
 asyncmock==0.4.2; python_version < '3.8'
+anyio==3.7.1
 
 # Documentation generation
 Sphinx==4.3.2  # pyup: <4.4  # importlib-metadata conflict with flake8
 sphinxcontrib-spelling==7.7.0
 sphinx-material==0.0.35
+sphinxcontrib-applehelp==1.0.2  # https://github.com/googleapis/sphinx-docfx-yaml/issues/344
+sphinxcontrib-devhelp==1.0.2
+sphinxcontrib-htmlhelp==2.0.0
+sphinxcontrib-qthelp==1.0.3
+sphinxcontrib-serializinghtml==1.1.5
 
 # Code style and type checks
 mypy==1.0.0; platform_python_implementation == "CPython"