Merge pull request #1981 from recommenders-team/staging

Staging to main: license update, tests
recommenders-team · Aug 31, 2023 · 57f37ea · 57f37ea
2 parents 29c64c9 + 4d8629c
commit 57f37ea
Show file tree

Hide file tree

Showing 245 changed files with 50,067 additions and 50,106 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,5 +1,5 @@
 # See https://help.github.com/articles/about-codeowners/
 # for more info about CODEOWNERS file
 
-*           @miguelgfierro @gramhagen @anargyri @loomlike @wutaomsft @simonzhaoms
+*           @miguelgfierro @gramhagen @anargyri @loomlike @wutaomsft @simonyansenzhao
 
diff --git a/.github/actions/azureml-test/action.yml b/.github/actions/azureml-test/action.yml
@@ -1,5 +1,5 @@
 # ---------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Recommenders contributors.
 # Licensed under the MIT License.
 # ---------------------------------------------------------
 

diff --git a/.github/actions/get-test-groups/action.yml b/.github/actions/get-test-groups/action.yml
@@ -1,5 +1,5 @@
 # ---------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Recommenders contributors.
 # Licensed under the MIT License.
 # ---------------------------------------------------------
 

diff --git a/.github/workflows/azureml-cpu-nightly.yml b/.github/workflows/azureml-cpu-nightly.yml
@@ -1,5 +1,5 @@
 # ---------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Recommenders contributors.
 # Licensed under the MIT License.
 # ---------------------------------------------------------
 

diff --git a/.github/workflows/azureml-gpu-nightly.yml b/.github/workflows/azureml-gpu-nightly.yml
@@ -1,5 +1,5 @@
 # ---------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Recommenders contributors.
 # Licensed under the MIT License.
 # ---------------------------------------------------------
 

diff --git a/.github/workflows/azureml-release-pipeline.yml b/.github/workflows/azureml-release-pipeline.yml
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Recommenders contributors.
 # Licensed under the MIT License.
 
 on:

diff --git a/.github/workflows/azureml-spark-nightly.yml b/.github/workflows/azureml-spark-nightly.yml
@@ -1,5 +1,5 @@
 # ---------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Recommenders contributors.
 # Licensed under the MIT License.
 # ---------------------------------------------------------
 

diff --git a/.github/workflows/azureml-unit-tests.yml b/.github/workflows/azureml-unit-tests.yml
@@ -1,5 +1,5 @@
 # ---------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Recommenders contributors.
 # Licensed under the MIT License.
 # ---------------------------------------------------------
 

diff --git a/.github/workflows/pypi-test-publish.yml b/.github/workflows/pypi-test-publish.yml
diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
diff --git a/.github/workflows/sarplus.yml b/.github/workflows/sarplus.yml
@@ -1,5 +1,5 @@
 # ---------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Recommenders contributors.
 # Licensed under the MIT License.
 # ---------------------------------------------------------
 # This workflow will run tests and do packaging for contrib/sarplus.

diff --git a/AUTHORS.md b/AUTHORS.md
@@ -32,7 +32,7 @@ They have admin access to the repo and provide support reviewing issues and pull
 * **[Scott Graham](https://github.com/gramhagen)**
    * Improving documentation
    * VW notebook
-* **[Simon Zhao](https://github.com/simonzhaoms)**
+* **[Simon Zhao](https://github.com/simonyansenzhao)**
    * SARplus algorithm upgrade
 * **[Tao Wu](https://github.com/wutaomsft)**
    * Improving documentation

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -23,6 +23,7 @@ Here are the basic steps to get started with your first contribution. Please rea
 1. Create a test that replicates the issue.
 1. Make code changes.
 1. Ensure unit tests pass and code style / formatting is consistent (see [wiki](https://github.com/Microsoft/Recommenders/wiki/Coding-Guidelines#python-and-docstrings-style) for more details).
+1. When adding code to the repo, make sure you sign the commits, otherwise the tests will fail (see [how to sign the commits](https://github.com/recommenders-team/recommenders/wiki/How-to-sign-commits)).
 1. Create a pull request against **staging** branch.
 
 Once the features included in a [milestone](https://github.com/microsoft/recommenders/milestones) are completed, we will merge staging into main. See the wiki for more detail about our [merge strategy](https://github.com/microsoft/recommenders/wiki/Strategy-to-merge-the-code-to-main-branch).

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,7 @@
     MIT License
 
-    Copyright (c) Microsoft Corporation. All rights reserved.
+    Copyright (c) 2018-present Microsoft Corporation.
+    Copyright (c) 2023-present Recommenders contributors.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal

diff --git a/NEWS.md b/NEWS.md
@@ -1,10 +1,14 @@
 # What's New
 
+## Update August 18, 2023
+
+We moved to a new organization! Now to access the repo, instead of going to https://github.com/microsoft/recommenders, you need to go to https://github.com/recommenders-team/recommenders. The old URL will still resolve to the new one, but we recommend you to update your bookmarks.
+
 ## Update February 7, 2023 
 
 We reached 15,000 stars!!
 
-## Update July, 2022
+## Update July 20, 2022
 
 We have a new release [Recommenders 1.1.1](https://github.com/microsoft/recommenders/releases/tag/1.1.1)! 
 

diff --git a/README.md b/README.md
@@ -2,15 +2,11 @@
 
 [![Documentation Status](https://readthedocs.org/projects/microsoft-recommenders/badge/?version=latest)](https://microsoft-recommenders.readthedocs.io/en/latest/?badge=latest)
 
-## What's New (April, 2023)
+<img src="https://raw.githubusercontent.com/recommenders-team/artwork/main/color/recommenders_color.svg" width="800">
 
-We reached 15,000 stars!!
+## What's New (August, 2023)
 
-Our latest release is [Recommenders 1.1.1](https://github.com/microsoft/recommenders/releases/tag/1.1.1)! 
-
-We have introduced a new way of testing our repository using [AzureML](https://azure.microsoft.com/en-us/services/machine-learning/). With AzureML we are able to distribute our tests to different machines and run them in parallel. This allows us to test our repository on a wider range of machines and provides us with a much faster test cycle. Our total computation time went from around 9h to 35min, and we were able to reduce the costs by half. See more details [here](tests/README.md).
-
-We also made other improvements like faster evaluation metrics and improving SAR algorithm. 
+We moved to a new organization! Now to access the repo, instead of going to https://github.com/microsoft/recommenders, you need to go to https://github.com/recommenders-team/recommenders. The old URL will still resolve to the new one, but we recommend you to update your bookmarks.
 
 Starting with release 0.6.0, Recommenders has been available on PyPI and can be installed using pip! 
 

diff --git a/contrib/sarplus/python/.flake8 b/contrib/sarplus/python/.flake8
@@ -1,4 +1,4 @@
 [flake8]
 max-line-length = 120
-ignore = W291
+ignore = W291,W503
 per-file-ignores = pysarplus/SARPlus.py: E501, pysarplus/__init__.py: F401
diff --git a/contrib/sarplus/python/pysarplus/SARModel.py b/contrib/sarplus/python/pysarplus/SARModel.py
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Recommenders contributors.
 # Licensed under the MIT License.
 
 import pysarplus_cpp
@@ -21,7 +21,9 @@ def __init__(self, path):
         sar_files = list(Path(path).glob("*" + SARModel.__extension))
         sar_files.sort(key=os.path.getmtime, reverse=True)
         if len(sar_files) < 1:
-            raise ValueError(f"Directory '{path}' must contain at least 1 file ending in '{SARModel.__extension}'")
+            raise ValueError(
+                f"Directory '{path}' must contain at least 1 file ending in '{SARModel.__extension}'"
+            )
 
         # instantiate C++ backend
         SARModel.__model = self.model = pysarplus_cpp.SARModelCpp(str(sar_files[0]))

diff --git a/contrib/sarplus/python/pysarplus/SARPlus.py b/contrib/sarplus/python/pysarplus/SARPlus.py
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Recommenders contributors.
 # Licensed under the MIT License.
 """This is the implementation of SAR."""
 

diff --git a/contrib/sarplus/python/pysarplus/__init__.py b/contrib/sarplus/python/pysarplus/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Recommenders contributors.
 # Licensed under the MIT License.
 
 from pathlib import Path
@@ -10,7 +10,7 @@
 __version__ = (Path(__file__).resolve().parent / "VERSION").read_text().strip()
 __author__ = "RecoDev Team at Microsoft"
 __license__ = "MIT"
-__copyright__ = "Copyright 2018-present Microsoft Corporation"
+__copyright__ = "Copyright 2018-present Recommenders contributors."
 
 # Synonyms
 TITLE = __title__

diff --git a/contrib/sarplus/python/setup.py b/contrib/sarplus/python/setup.py
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Recommenders contributors.
 # Licensed under the MIT License.
 
 from pathlib import Path
@@ -26,10 +26,12 @@ def __str__(self):
 
 setup(
     name="pysarplus",
-    version=(Path(__file__).resolve().parent / "pysarplus" / "VERSION").read_text().strip(),
+    version=(Path(__file__).resolve().parent / "pysarplus" / "VERSION")
+    .read_text()
+    .strip(),
     description="SAR prediction for use with PySpark",
     long_description=(Path(__file__).resolve().parent / "README.md").read_text(),
-    long_description_content_type='text/markdown',
+    long_description_content_type="text/markdown",
     url="https://github.com/microsoft/recommenders/tree/main/contrib/sarplus",
     author="RecoDev Team at Microsoft",
     author_email="recodevteam@service.microsoft.com",

diff --git a/contrib/sarplus/python/src/pysarplus.cpp b/contrib/sarplus/python/src/pysarplus.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Copyright (c) Recommenders contributors.
  * Licensed under the MIT License.
  */
 

diff --git a/contrib/sarplus/python/tests/conftest.py b/contrib/sarplus/python/tests/conftest.py
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Recommenders contributors.
 # Licensed under the MIT License.
 
 import calendar

diff --git a/contrib/sarplus/python/tests/test_pyspark_sar.py b/contrib/sarplus/python/tests/test_pyspark_sar.py
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Recommenders contributors.
 # Licensed under the MIT License.
 
 import math
@@ -381,7 +381,13 @@ def test_userpred(
     df = spark.createDataFrame(demo_usage_data)
     model.fit(df)
 
-    url = sar_settings["FILE_DIR"] + "userpred_" + file + str(threshold) + "_userid_only.csv"
+    url = (
+        sar_settings["FILE_DIR"]
+        + "userpred_"
+        + file
+        + str(threshold)
+        + "_userid_only.csv"
+    )
 
     pred_ref = pd.read_csv(url)
     pred_ref = (

diff --git a/contrib/sarplus/scala/build.sbt b/contrib/sarplus/scala/build.sbt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Copyright (c) Recommenders contributors.
  * Licensed under the MIT License.
  */
 

diff --git a/...s/scala/compat/src/main/scala/com/microsoft/sarplus/compat/spark/since3p2defvisible.scala b/...s/scala/compat/src/main/scala/com/microsoft/sarplus/compat/spark/since3p2defvisible.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Copyright (c) Recommenders contributors.
  * Licensed under the MIT License.
  */
 

diff --git a/contrib/sarplus/scala/python/pysarplus_dummy/__init__.py b/contrib/sarplus/scala/python/pysarplus_dummy/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Recommenders contributors.
 # Licensed under the MIT License.
 
 installed = 1
diff --git a/contrib/sarplus/scala/python/setup.py b/contrib/sarplus/scala/python/setup.py
@@ -1,12 +1,14 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Recommenders contributors.
 # Licensed under the MIT License.
 
 from distutils.core import setup
 from pathlib import Path
 
 setup(
     name="pysarplus_dummy",
-    version=(Path(__file__).resolve().parent.parent.parent / "VERSION").read_text().strip(),
+    version=(Path(__file__).resolve().parent.parent.parent / "VERSION")
+    .read_text()
+    .strip(),
     description="pysarplus dummy package to trigger spark packaging",
     author="RecoDev Team at Microsoft",
     author_email="recodevteam@service.microsoft.com",

diff --git a/contrib/sarplus/scala/src/main/scala/com/microsoft/sarplus/DefaultSource.scala b/contrib/sarplus/scala/src/main/scala/com/microsoft/sarplus/DefaultSource.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Copyright (c) Recommenders contributors.
  * Licensed under the MIT License.
  */
 

diff --git a/contrib/sarplus/scala/src/main/scala/com/microsoft/sarplus/SARCacheOutputWriter.scala b/contrib/sarplus/scala/src/main/scala/com/microsoft/sarplus/SARCacheOutputWriter.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Copyright (c) Recommenders contributors.
  * Licensed under the MIT License.
  */
 

diff --git a/contrib/sarplus/scala/src/main/scala/com/microsoft/sarplus/SARCacheOutputWriterFactory.scala b/contrib/sarplus/scala/src/main/scala/com/microsoft/sarplus/SARCacheOutputWriterFactory.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Copyright (c) Recommenders contributors.
  * Licensed under the MIT License.
  */
 

diff --git a/contrib/sarplus/scala/src/test/scala/com/microsoft/sarplus/SARCacheOutputWriterSpec.scala b/contrib/sarplus/scala/src/test/scala/com/microsoft/sarplus/SARCacheOutputWriterSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Copyright (c) Recommenders contributors.
  * Licensed under the MIT License.
  */
 

diff --git a/docs/Makefile b/docs/Makefile
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Recommenders contributors.
 # Licensed under the MIT License.
 
 # You can set these variables from the command line.

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
+# Copyright (c) Recommenders contributors.
 # Licensed under the MIT License.
 
 # -*- coding: utf-8 -*-