Set PYTHONPATH in Makefile

AdaCore · Jan 6, 2023 · dab4c1b · dab4c1b
1 parent 29f1e96
commit dab4c1b
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 13 deletions.
diff --git a/.github/workflows/edge_tests.yml b/.github/workflows/edge_tests.yml
@@ -49,7 +49,6 @@ jobs:
     - name: Install dependencies
       run: |
         echo "$HOME/.local/bin" >> $GITHUB_PATH
-        echo "PYTHONPATH=$PWD" >> $GITHUB_ENV
         sudo apt install libgmp-dev patchelf
         python -m pip install --upgrade pip wheel
         make init install_devel_edge
@@ -91,7 +90,6 @@ jobs:
     - name: Install dependencies
       run: |
         echo "$HOME/.local/bin" >> $GITHUB_PATH
-        echo "PYTHONPATH=$PWD" >> $GITHUB_ENV
         echo "HYPOTHESIS_PROFILE=ci" >> $GITHUB_ENV
         echo "PYTEST_ADDOPTS=--basetemp=build" >> $GITHUB_ENV
         sudo apt install graphviz libgmp-dev patchelf

diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
@@ -54,7 +54,6 @@ jobs:
       - name: Install dependencies
         run: |
           echo "$HOME/.local/bin" >> $GITHUB_PATH
-          echo "PYTHONPATH=$PWD" >> $GITHUB_ENV
           sudo apt install libgmp-dev patchelf
           python -m pip install --upgrade pip wheel
           make init install_devel

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -66,7 +66,6 @@ jobs:
     - name: Install dependencies
       run: |
         echo "$HOME/.local/bin" >> $GITHUB_PATH
-        echo "PYTHONPATH=$PWD" >> $GITHUB_ENV
         sudo apt install libgmp-dev patchelf
         python -m pip install --upgrade pip wheel
         make init install_devel
@@ -156,7 +155,6 @@ jobs:
     - name: Install dependencies
       run: |
         echo "$HOME/.local/bin" >> $GITHUB_PATH
-        echo "PYTHONPATH=$PWD" >> $GITHUB_ENV
         echo "HYPOTHESIS_PROFILE=ci" >> $GITHUB_ENV
         sudo apt install graphviz libgmp-dev patchelf
         python -m pip install --upgrade pip wheel
@@ -261,7 +259,6 @@ jobs:
       - name: Install dependencies
         run: |
           echo "$HOME/.local/bin" >> $GITHUB_PATH
-          echo "PYTHONPATH=$PWD" >> $GITHUB_ENV
           echo "HYPOTHESIS_PROFILE=ci" >> $GITHUB_ENV
           sudo apt install graphviz libgmp-dev patchelf
           python -m pip install --upgrade pip wheel
@@ -309,7 +306,6 @@ jobs:
       - name: Install dependencies
         run: |
           echo "$HOME/.local/bin" >> $GITHUB_PATH
-          echo "PYTHONPATH=$PWD" >> $GITHUB_ENV
           echo "HYPOTHESIS_PROFILE=ci" >> $GITHUB_ENV
           sudo apt install graphviz libgmp-dev patchelf
           python -m pip install --upgrade pip wheel
@@ -365,7 +361,6 @@ jobs:
     - name: Install dependencies
       run: |
         echo "$HOME/.local/bin" >> $GITHUB_PATH
-        echo "PYTHONPATH=$PWD" >> $GITHUB_ENV
         echo "HYPOTHESIS_PROFILE=ci" >> $GITHUB_ENV
         sudo apt install graphviz libgmp-dev patchelf
         python -m pip install --upgrade pip wheel
@@ -454,7 +449,6 @@ jobs:
     - name: Install dependencies
       run: |
         echo "$HOME/.local/bin" >> $GITHUB_PATH
-        echo "PYTHONPATH=$PWD" >> $GITHUB_ENV
         sudo apt install libgmp-dev patchelf
         python -m pip install --upgrade pip wheel
         make init install_devel
@@ -538,7 +532,6 @@ jobs:
     - name: Install dependencies
       run: |
         echo "$HOME/.local/bin" >> $GITHUB_PATH
-        echo "PYTHONPATH=$PWD" >> $GITHUB_ENV
         echo "HYPOTHESIS_PROFILE=ci" >> $GITHUB_ENV
         sudo apt install graphviz libgmp-dev patchelf dnsmasq
         python -m pip install --upgrade pip wheel
@@ -616,7 +609,6 @@ jobs:
     - name: Install dependencies
       run: |
         echo "$HOME/.local/bin" >> $GITHUB_PATH
-        echo "PYTHONPATH=$PWD" >> $GITHUB_ENV
         sudo apt install libgmp-dev patchelf
         python -m pip install --upgrade pip wheel
         make init install_devel
@@ -684,7 +676,6 @@ jobs:
     - name: Install dependencies
       run: |
         echo "$HOME/.local/bin" >> $GITHUB_PATH
-        echo "PYTHONPATH=$PWD" >> $GITHUB_ENV
         echo "HYPOTHESIS_PROFILE=ci" >> $GITHUB_ENV
         sudo apt install graphviz libgmp-dev patchelf
         python -m pip install --upgrade pip wheel
@@ -742,7 +733,6 @@ jobs:
     - name: Install dependencies
       run: |
         echo "$HOME/.local/bin" >> $GITHUB_PATH
-        echo "PYTHONPATH=$PWD" >> $GITHUB_ENV
         sudo apt install libgmp-dev patchelf
         python -m pip install --upgrade pip wheel
         make init install_devel

diff --git a/Makefile b/Makefile
@@ -17,6 +17,7 @@ GNATPROVE_CACHE_DIR = $(subst file:,,$(GNATPROVE_CACHE))
 endif
 
 export GNATPROVE_CACHE := $(GNATPROVE_CACHE)
+export PYTHONPATH := $(PWD)
 
 # Switch to a specific revision of the git repository.
 #
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,6 +17,7 @@ GNATPROVE_CACHE_DIR = $(subst file:,,$(GNATPROVE_CACHE)) @@
     endif
     export GNATPROVE_CACHE := $(GNATPROVE_CACHE)
+    export PYTHONPATH := $(PWD)
     # Switch to a specific revision of the git repository.
     #
@@ Expand Down @@