From 2425f54bdb094548845bc5bfcd2c2c01b51cf888 Mon Sep 17 00:00:00 2001
From: aspargas2 <midnight337767@gmail.com>
Date: Mon, 7 Mar 2022 10:14:22 -0500
Subject: [PATCH] tweak what is backported, as requested

- don't backport `pyproject.toml` or related changes
- install some additional -dev packages with `apt-get` for CodeQL
- run CodeQL in a python venv
---
 .github/workflows/codeql-analysis.yml | 7 +++++--
 pyproject.toml                        | 3 ---
 setup.py                              | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)
 delete mode 100644 pyproject.toml

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 36550f272..f9403d0d4 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -47,8 +47,9 @@ jobs:
             ${{ runner.os }}-
     - name: Install requirements
       run: |
-       sudo apt-get update
-       sudo apt-get install -y libacl1-dev
+        sudo apt-get update
+        sudo apt-get install -y pkg-config build-essential
+        sudo apt-get install -y libssl-dev libacl1-dev libxxhash-dev liblz4-dev libzstd-dev
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1
@@ -60,6 +61,8 @@ jobs:
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
     - name: Build and install Borg
       run: |
+        python3 -m venv ../borg-env
+        source ../borg-env/bin/activate
         pip3 install -r requirements.d/development.txt
         pip3 install -e .
     - name: Perform CodeQL Analysis
diff --git a/pyproject.toml b/pyproject.toml
deleted file mode 100644
index cda60db81..000000000
--- a/pyproject.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[build-system]
-requires = ["setuptools", "pkgconfig", "Cython!=0.27"]
-build-backend = "setuptools.build_meta"
diff --git a/setup.py b/setup.py
index 977035d7d..98a844269 100644
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,6 @@ try:
 except ImportError:
     cythonize = None
 
-sys.path += [os.path.dirname(__file__)]
 import setup_checksums
 import setup_compress
 import setup_crypto