Skip to content

Commit fa849e9

Browse files
committed
Adjust versioning for python and scala [skip test]
1 parent 8a6ea08 commit fa849e9

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

python/docs/conf.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,21 @@
1212
#
1313
import os
1414
import sys
15+
from datetime import date
1516

1617
sys.path.insert(0, os.path.abspath("../"))
1718

19+
from sparknlp import __version__
1820

19-
# -- Project information -----------------------------------------------------
2021

22+
# -- Project information -----------------------------------------------------
2123
project = "Spark NLP"
22-
copyright = "2023, John Snow Labs"
24+
copyright = f"{date.today().year} John Snow Labs"
2325
author = "John Snow Labs"
2426

2527
# The full version, including alpha/beta/rc tags
26-
release = "6.0.1"
27-
pyspark_version = "3.2.3"
28+
release = __version__
29+
pyspark_version = "3.4.4"
2830

2931
# -- General configuration ---------------------------------------------------
3032

python/sparknlp/__init__.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@
6666
annotators = annotator
6767
embeddings = annotator
6868

69+
__version__ = "6.0.1"
70+
6971

7072
def start(gpu=False,
7173
apple_silicon=False,
@@ -132,7 +134,7 @@ def start(gpu=False,
132134
The initiated Spark session.
133135
134136
"""
135-
current_version = "6.0.1"
137+
current_version = __version__
136138

137139
if params is None:
138140
params = {}
@@ -316,4 +318,4 @@ def version():
316318
str
317319
The current Spark NLP version.
318320
"""
319-
return '6.0.1'
321+
return __version__

src/main/scala/com/johnsnowlabs/nlp/SparkNLP.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@ package com.johnsnowlabs.nlp
1818

1919
import com.johnsnowlabs.reader.SparkNLPReader
2020
import org.apache.spark.sql.SparkSession
21+
import com.johnsnowlabs.util.Build
2122

2223
import scala.collection.JavaConverters._
2324

2425
object SparkNLP {
2526

26-
val currentVersion = "6.0.1"
27+
val currentVersion: String = Build.version
2728
val MavenSpark3 = s"com.johnsnowlabs.nlp:spark-nlp_2.12:$currentVersion"
2829
val MavenGpuSpark3 = s"com.johnsnowlabs.nlp:spark-nlp-gpu_2.12:$currentVersion"
2930
val MavenSparkSilicon = s"com.johnsnowlabs.nlp:spark-nlp-silicon_2.12:$currentVersion"

0 commit comments

Comments
 (0)