Merge pull request #33 from icanbwell/revert-32-upgrade_to_spark_3.2

Revert "upgrade to spark 3.2"
icanbwell · Nov 12, 2021 · 4cf2b8f · 4cf2b8f
2 parents 6ddfcbf + bfa7219
commit 4cf2b8f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -6,9 +6,9 @@ BRANCH=$(shell git rev-parse --abbrev-ref HEAD)
 VERSION=$(shell cat VERSION)
 VENV_NAME=venv
 GIT_HASH=${CIRCLE_SHA1}
-SPARK_VER=3.2.0
+SPARK_VER=3.1.1
 HADOOP_VER=3.2
-PACKAGES_FOLDER=venv/lib/python3.7/site-packages
+PACKAGES_FOLDER=venv/lib/python3.6/site-packages
 SPF_BASE=${PACKAGES_FOLDER}
 
 include spark_fhir_schemas/Makefile.spark

diff --git a/requirements-test.txt b/requirements-test.txt
@@ -1,11 +1,11 @@
-setuptools>=58.5.3
+setuptools>=56.0.0
 wheel
-twine>=3.5.0
-pytest>=6.2.5
-mypy>=0.812,<1.000
-flake8>=4.0.1
+twine>=3.4.1
+pytest>=6.2.2
+mypy
+flake8>=3.9.1
 importlib-metadata>=4.0.1
-pre-commit==2.15.0
+pre-commit==2.12.1
 jinja2
-pyspark==3.2.0  # should match the version of spark we use for testing
-pygments>=2.10.0 # not directly required, pinned by Snyk to avoid a vulnerability
+pyspark==3.1.1  # should match the version of spark we use for testing
+pygments>=2.7.4 # not directly required, pinned by Snyk to avoid a vulnerability
diff --git a/requirements.txt b/requirements.txt
@@ -1 +1 @@
-pyspark==3.2.0
+pyspark==3.1.1