update (#28)

* update * update * update * update * update
fugue-project · May 11, 2021 · b107111 · b107111
1 parent 2ebaf13
commit b107111
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 10 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -23,6 +23,6 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
-      run: make dev
+      run: make devenv
     - name: Lint
       run: make lint
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -18,7 +18,7 @@ jobs:
       with:
         python-version: 3.7
     - name: Install dependencies
-      run: make dev
+      run: make devenv
     - name: Test
       run: make test
     # - name: Coveralls

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -23,6 +23,6 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
-      run: make dev
+      run: make devenv
     - name: Test
       run: make test
diff --git a/Makefile b/Makefile
@@ -11,6 +11,7 @@ help:
 devenv:
 	pip3 install -r requirements.txt
 	pre-commit install
+	bash scripts/add_avro_jar.sh
 
 dev:
 	pip3 install -r requirements.txt

diff --git a/README.md b/README.md
@@ -4,6 +4,10 @@ Fugue for Kaggle users
 
 ## Release History
 
+### 0.2.7
+
+* Update fugue and tune versions
+
 ### 0.2.6
 
 * Update tune version

diff --git a/fuggle/__init__.py b/fuggle/__init__.py
@@ -5,8 +5,8 @@
 from fuggle_version import __version__
 from fugue_sql import FugueSQLWorkflow as Dag
 from IPython import get_ipython
-from tune import TUNE_OBJECT_FACTORY, Monitor, NonIterativeObjectiveRunner
-from tune_hyperopt import HyperoptRunner
+from tune import TUNE_OBJECT_FACTORY, Monitor, NonIterativeObjectiveLocalOptimizer
+from tune_hyperopt import HyperoptLocalOptimizer
 from tune_notebook import (
     NotebookSimpleHist,
     NotebookSimpleRungs,
@@ -32,9 +32,9 @@ def setup(default_engine: str = "") -> Any:
     fn._setup_fugue_notebook(ip, KaggleNotebookSetup(default_engine))
 
 
-def _to_runner(obj: Any) -> Optional[NonIterativeObjectiveRunner]:
+def _to_runner(obj: Any) -> Optional[NonIterativeObjectiveLocalOptimizer]:
     if obj is None:
-        return HyperoptRunner(20, 0)
+        return HyperoptLocalOptimizer(20, 0)
     raise NotImplementedError(obj)
 
 

diff --git a/fuggle_version/__init__.py b/fuggle_version/__init__.py
@@ -1 +1 @@
-__version__ = "0.2.6"
+__version__ = "0.2.7"
diff --git a/scripts/add_avro_jar.sh b/scripts/add_avro_jar.sh
@@ -0,0 +1,2 @@
+SPARK_JAR=$(pip show pyspark | grep Location | cut -d' ' -f 2)
+wget -U "Any User Agent" -O "${SPARK_JAR}/pyspark/jars/spark-avro_2.12-3.0.1.jar"  https://repo1.maven.org/maven2/org/apache/spark/spark-avro_2.12/3.0.1/spark-avro_2.12-3.0.1.jar
diff --git a/setup.py b/setup.py
@@ -18,13 +18,14 @@
     keywords="fugue kaggle sql spark dask pandas",
     url="http://github.com/fugue-project/fuggle",
     install_requires=[
-        "fugue[spark,dask,sql]==0.5.3",
-        "tune[all]==0.0.6.dev2",
+        "fugue[spark,dask,sql]==0.5.6.dev1",
+        "tune[all]==0.0.6",
         "notebook",
         "kaggle",
         "seaborn",
         "qpd",
         "dask[dataframe]",
+        "pandavro",
     ],
     extras_require={},
     classifiers=[

diff --git a/tests/test_execution_engine.py b/tests/test_execution_engine.py
@@ -65,6 +65,8 @@ def test__join_outer_pandas_incompatible(self):
     def test_sample_n(self):
         pass
 
+
+
 
 class KaggleSparkExecutionEngineBuiltInTests(BuiltInTests.Tests):
     @pytest.fixture(autouse=True)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		SPARK_JAR=$(pip show pyspark \| grep Location \| cut -d' ' -f 2)
		wget -U "Any User Agent" -O "${SPARK_JAR}/pyspark/jars/spark-avro_2.12-3.0.1.jar" https://repo1.maven.org/maven2/org/apache/spark/spark-avro_2.12/3.0.1/spark-avro_2.12-3.0.1.jar
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,6 +65,8 @@ def test__join_outer_pandas_incompatible(self): @@
         def test_sample_n(self):
             pass
     class KaggleSparkExecutionEngineBuiltInTests(BuiltInTests.Tests):
         @pytest.fixture(autouse=True)
@@ Expand Down @@