Skip to content

Commit

Permalink
Bump version to 0.9.0 (#867)
Browse files Browse the repository at this point in the history
* Bump version to 0.9.0

* Include a python client setup fix from Jay

* Add a fallback
  • Loading branch information
blrchen authored Nov 18, 2022
1 parent 8237b10 commit 3c426ff
Show file tree
Hide file tree
Showing 12 changed files with 26 additions and 19 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import sbt.Keys.publishLocalConfiguration

ThisBuild / resolvers += Resolver.mavenLocal
ThisBuild / scalaVersion := "2.12.15"
ThisBuild / version := "0.9.0-rc3"
ThisBuild / version := "0.9.0"
ThisBuild / organization := "com.linkedin.feathr"
ThisBuild / organizationName := "linkedin"
val sparkVersion = "3.1.3"
Expand Down
2 changes: 1 addition & 1 deletion docs/how-to-guides/azure_resource_provision.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
"destinationBacpacBlobUrl": "[concat('https://',variables('dlsName'),'.blob.core.windows.net/',variables('dlsFsName'),'/',variables('bacpacBlobName'))]",
"bacpacDeploymentScriptName": "CopyBacpacFile",
"bacpacDbExtensionName": "registryRbacDbImport",
"preBuiltdockerImage": "feathrfeaturestore/feathr-registry:releases-v0.8.0"
"preBuiltdockerImage": "feathrfeaturestore/feathr-registry:releases-v0.9.0"
},
"functions": [],
"resources": [
Expand Down
2 changes: 1 addition & 1 deletion docs/how-to-guides/local-spark-provider.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ A spark-submit script will auto generated in your workspace under `debug` folder
spark-submit \
--master local[*] \
--name project_feathr_local_spark_test \
--packages "org.apache.spark:spark-avro_2.12:3.3.0,com.microsoft.sqlserver:mssql-jdbc:10.2.0.jre8,com.microsoft.azure:spark-mssql-connector_2.12:1.2.0,org.apache.logging.log4j:log4j-core:2.17.2,com.typesafe:config:1.3.4,com.fasterxml.jackson.core:jackson-databind:2.12.6.1,org.apache.hadoop:hadoop-mapreduce-client-core:2.7.7,org.apache.hadoop:hadoop-common:2.7.7,org.apache.avro:avro:1.8.2,org.apache.xbean:xbean-asm6-shaded:4.10,org.apache.spark:spark-sql-kafka-0-10_2.12:3.1.3,com.microsoft.azure:azure-eventhubs-spark_2.12:2.3.21,org.apache.kafka:kafka-clients:3.1.0,com.google.guava:guava:31.1-jre,it.unimi.dsi:fastutil:8.1.1,org.mvel:mvel2:2.2.8.Final,com.fasterxml.jackson.module:jackson-module-scala_2.12:2.13.3,com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.6,com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.12.6,com.jasonclawson:jackson-dataformat-hocon:1.1.0,com.redislabs:spark-redis_2.12:3.1.0,org.apache.xbean:xbean-asm6-shaded:4.10,com.google.protobuf:protobuf-java:3.19.4,net.snowflake:snowflake-jdbc:3.13.18,net.snowflake:spark-snowflake_2.12:2.10.0-spark_3.2,org.apache.commons:commons-lang3:3.12.0,org.xerial:sqlite-jdbc:3.36.0.3,com.github.changvvb:jackson-module-caseclass_2.12:1.1.1,com.azure.cosmos.spark:azure-cosmos-spark_3-1_2-12:4.11.1,org.eclipse.jetty:jetty-util:9.3.24.v20180605,commons-io:commons-io:2.6,org.apache.hadoop:hadoop-azure:2.7.4,com.microsoft.azure:azure-storage:8.6.4,com.linkedin.feathr:feathr_2.12:0.9.0-rc3" \
--packages "org.apache.spark:spark-avro_2.12:3.3.0,com.microsoft.sqlserver:mssql-jdbc:10.2.0.jre8,com.microsoft.azure:spark-mssql-connector_2.12:1.2.0,org.apache.logging.log4j:log4j-core:2.17.2,com.typesafe:config:1.3.4,com.fasterxml.jackson.core:jackson-databind:2.12.6.1,org.apache.hadoop:hadoop-mapreduce-client-core:2.7.7,org.apache.hadoop:hadoop-common:2.7.7,org.apache.avro:avro:1.8.2,org.apache.xbean:xbean-asm6-shaded:4.10,org.apache.spark:spark-sql-kafka-0-10_2.12:3.1.3,com.microsoft.azure:azure-eventhubs-spark_2.12:2.3.21,org.apache.kafka:kafka-clients:3.1.0,com.google.guava:guava:31.1-jre,it.unimi.dsi:fastutil:8.1.1,org.mvel:mvel2:2.2.8.Final,com.fasterxml.jackson.module:jackson-module-scala_2.12:2.13.3,com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.6,com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.12.6,com.jasonclawson:jackson-dataformat-hocon:1.1.0,com.redislabs:spark-redis_2.12:3.1.0,org.apache.xbean:xbean-asm6-shaded:4.10,com.google.protobuf:protobuf-java:3.19.4,net.snowflake:snowflake-jdbc:3.13.18,net.snowflake:spark-snowflake_2.12:2.10.0-spark_3.2,org.apache.commons:commons-lang3:3.12.0,org.xerial:sqlite-jdbc:3.36.0.3,com.github.changvvb:jackson-module-caseclass_2.12:1.1.1,com.azure.cosmos.spark:azure-cosmos-spark_3-1_2-12:4.11.1,org.eclipse.jetty:jetty-util:9.3.24.v20180605,commons-io:commons-io:2.6,org.apache.hadoop:hadoop-azure:2.7.4,com.microsoft.azure:azure-storage:8.6.4,com.linkedin.feathr:feathr_2.12:0.9.0" \
--conf "spark.driver.extraClassPath=../target/scala-2.12/classes:jars/config-1.3.4.jar:jars/jackson-dataformat-hocon-1.1.0.jar:jars/jackson-module-caseclass_2.12-1.1.1.jar:jars/mvel2-2.2.8.Final.jar:jars/fastutil-8.1.1.jar" \
--conf "spark.hadoop.fs.wasbs.impl=org.apache.hadoop.fs.azure.NativeAzureFileSystem" \
--class com.linkedin.feathr.offline.job.FeatureJoinJob \
Expand Down
2 changes: 1 addition & 1 deletion feathr_project/feathr/version.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "0.9.0-rc3"
__version__ = "0.9.0"

def get_version():
return __version__
Expand Down
11 changes: 9 additions & 2 deletions feathr_project/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,21 @@

# Use the README.md from /docs
root_path = Path(__file__).resolve().parent.parent
long_description = (root_path / "docs/README.md").read_text(encoding="utf8")
readme_path = root_path / "docs/README.md"
if readme_path.exists():
long_description = readme_path.read_text(encoding="utf8")
else:
# In some build environments (specifically in conda), we may not have the README file
# readily available. In these cases, just set long_description to the URL of README.md.
long_description = "See https://github.com/feathr-ai/feathr/blob/main/docs/README.md"

try:
exec(open("feathr/version.py").read())
except IOError:
print("Failed to load Feathr version file for packaging.",
file=sys.stderr)
sys.exit(-1)
# Temp workaround for conda build. For long term fix, Jay will need to update manifest.in file.
VERSION = "0.9.0"

VERSION = __version__ # noqa
os.environ["FEATHR_VERSION]"] = VERSION
Expand Down
4 changes: 2 additions & 2 deletions feathr_project/test/test_user_workspace/feathr_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ spark_config:
# Feathr Job configuration. Support local paths, path start with http(s)://, and paths start with abfs(s)://
# this is the default location so end users don't have to compile the runtime again.
# feathr_runtime_location: wasbs://[email protected]/feathr-assembly-LATEST.jar
feathr_runtime_location: "../../target/scala-2.12/feathr-assembly-0.9.0-rc3.jar"
feathr_runtime_location: "../../target/scala-2.12/feathr-assembly-0.9.0.jar"
databricks:
# workspace instance
workspace_instance_url: 'https://adb-2474129336842816.16.azuredatabricks.net/'
Expand All @@ -93,7 +93,7 @@ spark_config:
# Feathr Job location. Support local paths, path start with http(s)://, and paths start with dbfs:/
work_dir: 'dbfs:/feathr_getting_started'
# this is the default location so end users don't have to compile the runtime again.
feathr_runtime_location: "../../target/scala-2.12/feathr-assembly-0.9.0-rc3.jar"
feathr_runtime_location: "../../target/scala-2.12/feathr-assembly-0.9.0.jar"

online_store:
redis:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ spark_config:
workspace_dir: 'abfss://[email protected]/feathr_test_workspace'
executor_size: 'Small'
executor_num: 1
feathr_runtime_location: "../../target/scala-2.12/feathr-assembly-0.9.0-rc3.jar"
feathr_runtime_location: "../../target/scala-2.12/feathr-assembly-0.9.0.jar"
databricks:
workspace_instance_url: 'https://adb-2474129336842816.16.azuredatabricks.net/'
workspace_token_value: ''
config_template: {"run_name":"FEATHR_FILL_IN","new_cluster":{"spark_version":"9.1.x-scala2.12","num_workers":1,"spark_conf":{"FEATHR_FILL_IN":"FEATHR_FILL_IN"},"instance_pool_id":"0403-214809-inlet434-pool-l9dj3kwz"},"libraries":[{"jar":"FEATHR_FILL_IN"}],"spark_jar_task":{"main_class_name":"FEATHR_FILL_IN","parameters":["FEATHR_FILL_IN"]}}
work_dir: 'dbfs:/feathr_getting_started'
feathr_runtime_location: "../../target/scala-2.12/feathr-assembly-0.9.0-rc3.jar"
feathr_runtime_location: "../../target/scala-2.12/feathr-assembly-0.9.0.jar"

online_store:
redis:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ spark_config:
workspace_dir: 'abfss://[email protected]/feathr_test_workspace'
executor_size: 'Small'
executor_num: 1
feathr_runtime_location: "../../target/scala-2.12/feathr-assembly-0.9.0-rc3.jar"
feathr_runtime_location: "../../target/scala-2.12/feathr-assembly-0.9.0.jar"
databricks:
workspace_instance_url: 'https://adb-2474129336842816.16.azuredatabricks.net/'
workspace_token_value: ''
config_template: {"run_name":"FEATHR_FILL_IN","new_cluster":{"spark_version":"9.1.x-scala2.12","num_workers":1,"spark_conf":{"FEATHR_FILL_IN":"FEATHR_FILL_IN"},"instance_pool_id":"0403-214809-inlet434-pool-l9dj3kwz"},"libraries":[{"jar":"FEATHR_FILL_IN"}],"spark_jar_task":{"main_class_name":"FEATHR_FILL_IN","parameters":["FEATHR_FILL_IN"]}}
work_dir: 'dbfs:/feathr_getting_started'
feathr_runtime_location: "../../target/scala-2.12/feathr-assembly-0.9.0-rc3.jar"
feathr_runtime_location: "../../target/scala-2.12/feathr-assembly-0.9.0.jar"

online_store:
redis:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ spark_config:
workspace_dir: 'abfss://[email protected]/feathr_test_workspace'
executor_size: 'Small'
executor_num: 1
feathr_runtime_location: "../../target/scala-2.12/feathr-assembly-0.9.0-rc3.jar"
feathr_runtime_location: "../../target/scala-2.12/feathr-assembly-0.9.0.jar"
databricks:
workspace_instance_url: 'https://adb-2474129336842816.16.azuredatabricks.net/'
workspace_token_value: ''
config_template: {"run_name":"FEATHR_FILL_IN","new_cluster":{"spark_version":"9.1.x-scala2.12","num_workers":1,"spark_conf":{"FEATHR_FILL_IN":"FEATHR_FILL_IN"},"instance_pool_id":"0403-214809-inlet434-pool-l9dj3kwz"},"libraries":[{"jar":"FEATHR_FILL_IN"}],"spark_jar_task":{"main_class_name":"FEATHR_FILL_IN","parameters":["FEATHR_FILL_IN"]}}
work_dir: 'dbfs:/feathr_getting_started'
feathr_runtime_location: "../../target/scala-2.12/feathr-assembly-0.9.0-rc3.jar"
feathr_runtime_location: "../../target/scala-2.12/feathr-assembly-0.9.0.jar"

online_store:
redis:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ spark_config:
workspace_dir: 'abfss://[email protected]/feathr_test_workspace'
executor_size: 'Small'
executor_num: 1
feathr_runtime_location: "../../target/scala-2.12/feathr-assembly-0.9.0-rc3.jar"
feathr_runtime_location: "../../target/scala-2.12/feathr-assembly-0.9.0.jar"
databricks:
workspace_instance_url: 'https://adb-2474129336842816.16.azuredatabricks.net/'
workspace_token_value: ''
config_template: {"run_name":"FEATHR_FILL_IN","new_cluster":{"spark_version":"9.1.x-scala2.12","num_workers":1,"spark_conf":{"FEATHR_FILL_IN":"FEATHR_FILL_IN"},"instance_pool_id":"0403-214809-inlet434-pool-l9dj3kwz"},"libraries":[{"jar":"FEATHR_FILL_IN"}],"spark_jar_task":{"main_class_name":"FEATHR_FILL_IN","parameters":["FEATHR_FILL_IN"]}}
work_dir: 'dbfs:/feathr_getting_started'
feathr_runtime_location: "../../target/scala-2.12/feathr-assembly-0.9.0-rc3.jar"
feathr_runtime_location: "../../target/scala-2.12/feathr-assembly-0.9.0.jar"

online_store:
redis:
Expand Down
4 changes: 2 additions & 2 deletions ui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "feathr-ui",
"version": "0.9.0-rc3",
"version": "0.9.0",
"private": true,
"dependencies": {
"@ant-design/icons": "^4.7.0",
Expand Down

0 comments on commit 3c426ff

Please sign in to comment.