Skip to content

Commit cbc2535

Browse files
Merge pull request #241 from microsoft/dev
fix: Merging Dev to Main branch
2 parents d756b7c + 1bc1e0c commit cbc2535

File tree

31 files changed

+7487
-18134
lines changed

31 files changed

+7487
-18134
lines changed

.github/workflows/pylint.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,8 @@ jobs:
1818
run: |
1919
python -m pip install --upgrade pip
2020
pip install -r ClientAdvisor/App/requirements.txt
21-
- name: Run flake8
22-
run: flake8 --config=ClientAdvisor/App/.flake8 ClientAdvisor/App
21+
pip install -r ResearchAssistant/App/requirements.txt
22+
- name: Run flake8 and pylint
23+
run: |
24+
flake8 --config=ClientAdvisor/App/.flake8 ClientAdvisor/App
25+
flake8 --config=ResearchAssistant/App/.flake8 ResearchAssistant/App

ClientAdvisor/App/.flake8

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[flake8]
22
max-line-length = 88
3-
extend-ignore = E501, E203
4-
exclude = .venv, frontend,
3+
extend-ignore = E501
4+
exclude = .venv, frontend
5+
ignore = E203, W503, G004, G200

ClientAdvisor/App/frontend/__mocks__/react-markdown.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ const mockNode = {
99
const mockProps = { className: 'language-javascript' };
1010

1111
const ReactMarkdown: React.FC<{ children: React.ReactNode , components: any }> = ({ children,components }) => {
12+
if(!components.code){
13+
components.code = ({ ...codeProps }) => {
14+
return <div>Test Code text from markdown </div>
15+
}
16+
}
1217
return <div data-testid="reactMockDown">
1318
{components && components.code({ node: mockNode, ...mockProps })}
1419
{children}</div>; // Simply render the children

0 commit comments

Comments
 (0)