From 4757c2d50eedb6b26da74c7321a73c15c3393a91 Mon Sep 17 00:00:00 2001
From: Chris Wegrzyn <chris.wegrzyn@bluelabs.com>
Date: Fri, 22 Jan 2021 15:25:28 -0500
Subject: [PATCH] Loosen tenacity dependency (#158)

Loosen the version of tenacity required to improve compatibility with other deps (such as airflow) especially under new pip resolver. I did a comparison of the tenacity code between 4.12 and 6.0, and didn't see anything that we relied on.
---
 .python-version                  | 2 +-
 deps.sh                          | 2 +-
 metrics/bigfiles_high_water_mark | 2 +-
 setup.py                         | 6 ++++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.python-version b/.python-version
index 49f37d1af..0f8778fa1 100644
--- a/.python-version
+++ b/.python-version
@@ -1 +1 @@
-records-mover-3.9.0
+records-mover-3.9.1
diff --git a/deps.sh b/deps.sh
index 0402a352a..6e572249c 100755
--- a/deps.sh
+++ b/deps.sh
@@ -7,7 +7,7 @@ export SLUGIFY_USES_TEXT_UNIDECODE=yes
 brew update && ( brew upgrade pyenv || true )
 pyenv rehash  # needed if pyenv is updated
 
-python_version=3.9.0
+python_version=3.9.1
 # zipimport.ZipImportError: can't decompress data; zlib not available:
 #    You may need `xcode-select --install` on OS X
 #    https://github.com/pyenv/pyenv/issues/451#issuecomment-151336786
diff --git a/metrics/bigfiles_high_water_mark b/metrics/bigfiles_high_water_mark
index 8966a6064..d84bb2950 100644
--- a/metrics/bigfiles_high_water_mark
+++ b/metrics/bigfiles_high_water_mark
@@ -1 +1 @@
-1147
+1149
diff --git a/setup.py b/setup.py
index ee7d2e79d..f8d50760d 100755
--- a/setup.py
+++ b/setup.py
@@ -134,7 +134,9 @@ def initialize_options(self) -> None:
 )
 
 airflow_dependencies = [
-    'apache-airflow>=1.10,<2'
+    # Minimum version here is needed to avoid syntax error in setup.py
+    # in 1.10.0
+    'apache-airflow>=1.10.1,<2'
 ]
 
 db_dependencies = [
@@ -326,7 +328,7 @@ def initialize_options(self) -> None:
           # resulting in runtime complaints.  Can be removed once 20.4
           # is proven to work.
           'chardet>=3,<4',
-          'tenacity>=6<7',
+          'tenacity>=4.12.0,<7',
           # v5.0.1 resolves https://github.com/exhuma/config_resolver/issues/69
           'config-resolver>=5.0.1,<6',
           'typing_inspect',