Fix merge conflicts with dev branch

Author: samwelkanda

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @samwelkanda @jobala @ddyett @MichaelMainer @shemogumbe

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,36 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: samwelkanda
+
+---
+
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/pull_request_template.md

@@ -0,0 +1,19 @@
+## Overview
+
+Brief description of what this PR does, and why it is needed.
+
+### Demo
+
+Optional. Screenshots, `curl` examples, etc.
+
+### Notes
+
+Optional. Ancillary topics, caveats, alternative strategies that didn't work out, anything else.
+
+## Testing Instructions
+
+* How to test this PR
+* Prefer bulleted description
+* Start after checking out this branch
+* Include any setup required, such as bundling scripts, restarting services, etc.
+* Include test case, and expected output

.github/workflows/ci.yml

@@ -35,9 +35,7 @@ jobs:
           pipenv run isort .
       - name: Lint with Pylint
         run: |
-          pipenv run pylint msgraphcore --disable=W --rcfile=.pylintrc
-      - name: Test with unittest
+          pipenv run pylint msgraph --disable=W --rcfile=.pylintrc
+      - name: Test with pytest
         run: |
-          pipenv run coverage run -m pytest tests/unit
-          pipenv run coverage run -m pytest tests/integration
-          pipenv run coverage html
+          pipenv run pytest

.pre-commit-config.yaml

@@ -21,19 +21,12 @@ repos:
         name: pylint
         stages: [commit]
         language: system
-        entry: pipenv run pylint msgraphcore --disable=W --rcfile=.pylintrc
+        entry: pipenv run pylint msgraph --disable=W --rcfile=.pylintrc
         types: [python]
 
-      - id: pytest-unit
-        name: pytest-unit
+      - id: pytest
+        name: pytest
         stages: [commit]
         language: system
-        entry: pipenv run coverage run -m pytest tests/unit
-        types: [python]
-
-      - id: pytest-integration
-        name: pytest-integration
-        stages: [commit]
-        language: system
-        entry: pipenv run coverage run -m pytest tests/integration
+        entry: pipenv run pytest tests
         types: [python]

.pypirc

@@ -0,0 +1,12 @@
+[distutils]
+index-servers =
+   pypi
+   testpypi
+
+[pypi]
+repository = https://upload.pypi.org/legacy/
+username = msgraphsdkteam  # Replace with your PyPI username
+
+[testpypi]
+repository = https://test.pypi.org/legacy/
+username = msgraphsdkteam  # Replace with your TestPyPI username

Pipfile

@@ -5,16 +5,15 @@ name = "pypi"
 
 [packages] # Packages required to run the application
 requests = "==2.23.0"
-pre-commit = "==2.10.1"
 
 [dev-packages] # Packages required to develop the application
 coverage = "==5.0.3"
-pylint = "==2.6.0"
 responses = "==0.10.12"
 flit = "==2.2.0"
-azure-identity = "==1.5.0"
 isort = "==5.7.0"
 yapf = "==0.30.0"
 mypy = "==0.800"
-pytest = "*"
-importlib-metadata = "*"
+pylint = "==2.7.4"
+pytest = "==6.2.4"
+pre-commit = "==2.13.0"
+azure-identity = "*"