From 569311d49cad895909d6460e7a86a74a117c6070 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <varagrawal@gmail.com>
Date: Mon, 4 Jan 2021 13:26:34 -0500
Subject: [PATCH] Revert "more precise python version control in CI"

This reverts commit 8540b2c07d8852971ff05ca77295f4485e953ed7.
---
 .github/scripts/python.sh          | 5 ++---
 .github/workflows/build-python.yml | 9 +--------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/.github/scripts/python.sh b/.github/scripts/python.sh
index 80f531229..a71e14c97 100644
--- a/.github/scripts/python.sh
+++ b/.github/scripts/python.sh
@@ -43,7 +43,7 @@ if [ -z ${PYTHON_VERSION+x} ]; then
     exit 127
 fi
 
-PYTHON="python${PYTHON_MAJOR_VERSION}"
+PYTHON="python${PYTHON_VERSION}"
 
 if [[ $(uname) == "Darwin" ]]; then
     brew install wget
@@ -66,8 +66,7 @@ mkdir $GITHUB_WORKSPACE/build
 cd $GITHUB_WORKSPACE/build
 
 cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release \
-    -DGTSAM_BUILD_TESTS=OFF \
-    -DGTSAM_BUILD_UNSTABLE=ON \
+    -DGTSAM_BUILD_TESTS=OFF -DGTSAM_BUILD_UNSTABLE=ON \
     -DGTSAM_USE_QUATERNIONS=OFF \
     -DGTSAM_WITH_TBB=${GTSAM_WITH_TBB:-OFF} \
     -DGTSAM_BUILD_EXAMPLES_ALWAYS=OFF \
diff --git a/.github/workflows/build-python.yml b/.github/workflows/build-python.yml
index e4eafe920..3f9a2e98a 100644
--- a/.github/workflows/build-python.yml
+++ b/.github/workflows/build-python.yml
@@ -12,8 +12,6 @@ jobs:
       CTEST_PARALLEL_LEVEL: 2
       CMAKE_BUILD_TYPE: ${{ matrix.build_type }}
       PYTHON_VERSION: ${{ matrix.python_version }}
-      PYTHON_MAJOR_VERSION: 3
-
     strategy:
       fail-fast: false
       matrix:
@@ -28,37 +26,32 @@ jobs:
         ]
 
         build_type: [Debug, Release]
-
+        python_version: [3]
         include:
           - name: ubuntu-18.04-gcc-5
             os: ubuntu-18.04
             compiler: gcc
             version: "5"
-            python_version: 3.6.9
 
           - name: ubuntu-18.04-gcc-9
             os: ubuntu-18.04
             compiler: gcc
             version: "9"
-            python_version: 3.6.9
 
           - name: ubuntu-18.04-clang-9
             os: ubuntu-18.04
             compiler: clang
             version: "9"
-            python_version: 3.6.9
 
           - name: macOS-10.15-xcode-11.3.1
             os: macOS-10.15
             compiler: xcode
             version: "11.3.1"
-            python_version: 3.9.1
 
           - name: ubuntu-18.04-gcc-5-tbb
             os: ubuntu-18.04
             compiler: gcc
             version: "5"
-            python_version: 3.6.9
             flag: tbb
 
     steps: