diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10df8cc..c94f3a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 0.2.2
+
+- Add the conversion from FITS file (single HDU) to parquet ([PR](https://github.com/astrolabsoftware/spark3D/pull/92))
+- Tools to perform live 3D RDD visualisation (in progress) ([PR](https://github.com/astrolabsoftware/spark3D/pull/93))
+- Several updates to the Travis CI ([PR](https://github.com/astrolabsoftware/spark3D/pull/96))
+- Add example dealing with collapse function in pyspark ([PR](https://github.com/astrolabsoftware/spark3D/pull/97))
+- Deploy pyspark3d with pip ([PR](https://github.com/astrolabsoftware/spark3D/pull/98))
+- Clarify the use of get_spark_session and load_user_conf (for tests only!) ([PR](https://github.com/astrolabsoftware/spark3D/pull/99))
+
## 0.2.1
- pyspark3d contains all the features of spark3D ([partitioning](https://github.com/astrolabsoftware/spark3D/pull/89), [operators](https://github.com/astrolabsoftware/spark3D/pull/90))
diff --git a/README.md b/README.md
index 05833f8..de4ff1a 100644
--- a/README.md
+++ b/README.md
@@ -11,9 +11,9 @@
- [07/2018] **New location**: spark3D is an official project of [AstroLab Software](https://astrolabsoftware.github.io/)!
- [07/2018] **Release**: version 0.1.3, 0.1.4, 0.1.5
- [08/2018] **Release**: version 0.2.0, 0.2.1 (pyspark3d)
-- [09/2018] **Release**: version 0.2.2 (pip installation)
+- [09/2018] **Release**: version 0.2.2
-
+
## Installation and tutorials
@@ -23,7 +23,7 @@
You can link spark3D to your project (either spark-shell or spark-submit) by specifying the coordinates:
```
-spark-submit --packages "com.github.astrolabsoftware:spark3d_2.11:0.2.1"
+spark-submit --packages "com.github.astrolabsoftware:spark3d_2.11:0.2.2"
```
### Python
diff --git a/build.sbt b/build.sbt
index 3a24702..fbae3c9 100644
--- a/build.sbt
+++ b/build.sbt
@@ -19,7 +19,7 @@ import xerial.sbt.Sonatype._
lazy val root = (project in file(".")).
settings(
inThisBuild(List(
- version := "0.2.1"
+ version := "0.2.2"
)),
// Name of the application
name := "spark3D",
diff --git a/docs/01_installation.md b/docs/01_installation.md
index 2f199d6..9fcc70c 100644
--- a/docs/01_installation.md
+++ b/docs/01_installation.md
@@ -20,7 +20,7 @@ another version, feel free to contact us. In addition to Spark, the library has
You can link spark3D to your project (either `spark-shell` or `spark-submit`) by specifying the coordinates:
```bash
-toto:~$ spark-submit --packages "com.github.astrolabsoftware:spark3d_2.11:0.2.1" <...>
+toto:~$ spark-submit --packages "com.github.astrolabsoftware:spark3d_2.11:0.2.2" <...>
```
It might not contain the latest features though (see *Building from source*).
@@ -69,7 +69,7 @@ result on the screen, plus details of the coverage at
First produce a jar of the spark3D library, and then launch a spark-shell by specifying the external dependencies:
```bash
-toto:~$ JARS="target/scala-2.11/spark3d_2.11-0.2.1.jar,lib/jhealpix.jar"
+toto:~$ JARS="target/scala-2.11/spark3d_2.11-0.2.2.jar,lib/jhealpix.jar"
toto:~$ PACKAGES="com.github.astrolabsoftware:spark-fits_2.11:0.6.0"
toto:~$ spark-shell --jars $JARS --packages $PACKAGES
```
@@ -83,7 +83,7 @@ scala> // etc...
Note that if you make a fat jar (that is building with `sbt ++${SCALA_VERSION} assembly` and not `sbt ++${SCALA_VERSION} package`), you do not need to specify external dependencies as they are already included in the resulting jar:
```bash
-toto:~$ FATJARS="target/scala-2.11/spark3D-assembly-0.2.1.jar"
+toto:~$ FATJARS="target/scala-2.11/spark3D-assembly-0.2.2.jar"
toto:~$ spark-shell --jars $FATJARS
```
@@ -188,7 +188,7 @@ and then launch a pyspark shell:
```bash
toto:~$ PYSPARK_DRIVER_PYTHON=ipython pyspark \
- --jars /path/to/target/scala-2.11/spark3D-assembly-0.2.1.jar
+ --jars /path/to/target/scala-2.11/spark3D-assembly-0.2.2.jar
```
You should be able to import objects:
diff --git a/docs/_pages/home.md b/docs/_pages/home.md
index 385fc7c..abc3aca 100644
--- a/docs/_pages/home.md
+++ b/docs/_pages/home.md
@@ -8,7 +8,7 @@ header:
cta_url: "/docs/installation/"
caption:
intro:
- - excerpt: 'Spark extension for processing large-scale 3D data sets: Astrophysics, High Energy Physics, Meteorology, ...
Latest release v0.2.1'
+ - excerpt: 'Spark extension for processing large-scale 3D data sets: Astrophysics, High Energy Physics, Meteorology, ...
Latest release v0.2.2'
excerpt: '{::nomarkdown} {:/nomarkdown}'
feature_row:
- image_path:
diff --git a/examples/jupyter/CrossMatch.ipynb b/examples/jupyter/CrossMatch.ipynb
index 4e011db..66bc34c 100644
--- a/examples/jupyter/CrossMatch.ipynb
+++ b/examples/jupyter/CrossMatch.ipynb
@@ -124,7 +124,7 @@
"%AddDeps org.swinglabs swingx 1.6.1\n",
"\n",
"// Add the spark3d JAR. To generate it, run `sbt ++2.11.8 package` at the root of the package\n",
- "%AddJar file:/Users/julien/Documents/workspace/myrepos/spark3D/target/scala-2.11/spark3d_2.11-0.1.5.jar\n",
+ "%AddJar file:/Users/julien/Documents/workspace/myrepos/spark3D/target/scala-2.11/spark3d_2.11-0.2.2.jar\n",
"\n",
"// Add healpix JAR\n",
"%AddJar file:/Users/julien/Documents/workspace/myrepos/spark3D/lib/jhealpix.jar"
diff --git a/examples/jupyter/onion_partitioning.ipynb b/examples/jupyter/onion_partitioning.ipynb
index 026d6af..813df73 100644
--- a/examples/jupyter/onion_partitioning.ipynb
+++ b/examples/jupyter/onion_partitioning.ipynb
@@ -75,7 +75,7 @@
"%AddDeps org.swinglabs swingx 1.6.1\n",
"\n",
"// Add the spark3d JAR. To generate it, run `sbt ++2.11.8 package` at the root of the package\n",
- "%AddJar file:/Users/julien/Documents/workspace/myrepos/spark3D/target/scala-2.11/spark3d_2.11-0.1.5.jar\n",
+ "%AddJar file:/Users/julien/Documents/workspace/myrepos/spark3D/target/scala-2.11/spark3d_2.11-0.2.2.jar\n",
"\n",
"// Add healpix JAR\n",
"%AddJar file:/Users/julien/Documents/workspace/myrepos/spark3D/lib/jhealpix.jar"
diff --git a/examples/jupyter/windowQuery.ipynb b/examples/jupyter/windowQuery.ipynb
index 80dab62..08279d3 100644
--- a/examples/jupyter/windowQuery.ipynb
+++ b/examples/jupyter/windowQuery.ipynb
@@ -77,7 +77,7 @@
"%AddDeps org.swinglabs swingx 1.6.1\n",
"\n",
"// Add the spark3d JAR. To generate it, run `sbt ++2.11.8` package at the root of the package\n",
- "%AddJar file:/Users/julien/Documents/workspace/myrepos/spark3D/target/scala-2.11/spark3D-assembly-0.2.0.jar\n",
+ "%AddJar file:/Users/julien/Documents/workspace/myrepos/spark3D/target/scala-2.11/spark3D-assembly-0.2.2.jar\n",
"\n",
"// // Add healpix JAR\n",
"// %AddJar file:/Users/julien/Documents/workspace/myrepos/spark3D/lib/jhealpix.jar"
diff --git a/pic/spark3d_lib_0.2.2.png b/pic/spark3d_lib_0.2.2.png
new file mode 100644
index 0000000..65e6056
Binary files /dev/null and b/pic/spark3d_lib_0.2.2.png differ
diff --git a/pyspark3d/version.py b/pyspark3d/version.py
index 432e337..82d034e 100644
--- a/pyspark3d/version.py
+++ b/pyspark3d/version.py
@@ -1,4 +1,4 @@
# pyspark3d and spark3D have the same version number
-__version__ = "0.2.1"
+__version__ = "0.2.2"
__scala_version__ = "2.11"
__scala_version_all__ = "2.11.8"
diff --git a/release.sh b/release.sh
index 0753743..426f1e8 100755
--- a/release.sh
+++ b/release.sh
@@ -1,6 +1,7 @@
#!/bin/bash
## TODO before bumping version:
+## - Make a branch with the name of the version
## - run sbt clean
## - update build.sbt
## - update website (01_installation.md, picture of the package, _pages/home.md, )
@@ -9,6 +10,9 @@
## - update the CHANGELOG.md
## - update the runners
## - update the notebook, examples
+## - run test suites (or alternatively look at the PR)
+## - merge this branch into master
+## - goto master and pull change
## THEN:
## GitHub
diff --git a/runners/benchmark_knn.sh b/runners/benchmark_knn.sh
index 3e49add..e95a713 100755
--- a/runners/benchmark_knn.sh
+++ b/runners/benchmark_knn.sh
@@ -18,7 +18,7 @@ SBT_VERSION=2.11.8
SBT_VERSION_SPARK=2.11
## Package version
-VERSION=0.2.1
+VERSION=0.2.2
# Package it
sbt ++${SBT_VERSION} package
diff --git a/runners/launch_pyspark.sh b/runners/launch_pyspark.sh
index eeb1bef..bb56a40 100755
--- a/runners/launch_pyspark.sh
+++ b/runners/launch_pyspark.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# Run `sbt 'set test in assembly := {}' ++2.11.8 assembly` to get the JAR
-JARS=../target/scala-2.11/spark3D-assembly-0.2.1.jar
+JARS=../target/scala-2.11/spark3D-assembly-0.2.2.jar
# Octree - no part
spark-submit --jars $JARS \
diff --git a/runners/run_knn.sh b/runners/run_knn.sh
index 59c7792..d96abda 100755
--- a/runners/run_knn.sh
+++ b/runners/run_knn.sh
@@ -18,7 +18,7 @@ SBT_VERSION=2.11.8
SBT_VERSION_SPARK=2.11
## Package version
-VERSION=0.2.1
+VERSION=0.2.2
# Package it
sbt ++${SBT_VERSION} package
diff --git a/runners/run_knnGeo.sh b/runners/run_knnGeo.sh
index f52f3bd..8832cb7 100755
--- a/runners/run_knnGeo.sh
+++ b/runners/run_knnGeo.sh
@@ -18,7 +18,7 @@ SBT_VERSION=2.11.8
SBT_VERSION_SPARK=2.11
## Package version
-VERSION=0.2.1
+VERSION=0.2.2
# Package it
sbt ++${SBT_VERSION} package
diff --git a/runners/run_part.sh b/runners/run_part.sh
index 06c70ce..bc49680 100755
--- a/runners/run_part.sh
+++ b/runners/run_part.sh
@@ -18,7 +18,7 @@ SBT_VERSION=2.11.8
SBT_VERSION_SPARK=2.11
## Package version
-VERSION=0.2.1
+VERSION=0.2.2
# Package it
sbt ++${SBT_VERSION} package
diff --git a/runners/run_scala.sh b/runners/run_scala.sh
index f2b4c3c..eda941f 100755
--- a/runners/run_scala.sh
+++ b/runners/run_scala.sh
@@ -18,7 +18,7 @@ SBT_VERSION=2.11.8
SBT_VERSION_SPARK=2.11
## Package version
-VERSION=0.2.1
+VERSION=0.2.2
# Package it
sbt ++${SBT_VERSION} package
diff --git a/runners/run_shuffle.sh b/runners/run_shuffle.sh
index 4ca6cf6..39ff734 100755
--- a/runners/run_shuffle.sh
+++ b/runners/run_shuffle.sh
@@ -18,7 +18,7 @@ SBT_VERSION=2.11.8
SBT_VERSION_SPARK=2.11
## Package version
-VERSION=0.2.1
+VERSION=0.2.2
# Package it
sbt ++${SBT_VERSION} package
diff --git a/runners/run_xmatch.sh b/runners/run_xmatch.sh
index d27233c..3c57b7b 100755
--- a/runners/run_xmatch.sh
+++ b/runners/run_xmatch.sh
@@ -18,7 +18,7 @@ SBT_VERSION=2.11.8
SBT_VERSION_SPARK=2.11
## Package version
-VERSION=0.2.1
+VERSION=0.2.2
# Package it
sbt ++${SBT_VERSION} package
diff --git a/runners/run_xmatch_cluster.sh b/runners/run_xmatch_cluster.sh
index 8be5b3b..7e3306c 100755
--- a/runners/run_xmatch_cluster.sh
+++ b/runners/run_xmatch_cluster.sh
@@ -18,7 +18,7 @@ SBT_VERSION=2.11.8
SBT_VERSION_SPARK=2.11
## Package version
-VERSION=0.2.1
+VERSION=0.2.2
# Package it
sbt ++${SBT_VERSION} package
diff --git a/runners/run_xmatch_geo.sh b/runners/run_xmatch_geo.sh
index 611bb15..ef448b5 100755
--- a/runners/run_xmatch_geo.sh
+++ b/runners/run_xmatch_geo.sh
@@ -18,7 +18,7 @@ SBT_VERSION=2.11.8
SBT_VERSION_SPARK=2.11
## Package version
-VERSION=0.2.1
+VERSION=0.2.2
# Package it
sbt ++${SBT_VERSION} package