Skip to content

Add "(pip)" to setup install button #4013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 31, 2023
Merged

Add "(pip)" to setup install button #4013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f164da
Add "(pip)" to setup install button
julieg18 May 30, 2023
010157c
Fix typo
julieg18 May 30, 2023
7bde222
Merge branch 'main' into update-setup-install-button
julieg18 May 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions webview/src/setup/components/App.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ describe('App', () => {
`DVC & DVCLive can be auto-installed as packages with ${defaultInterpreter}`
)
).toBeInTheDocument()
expect(screen.getByText('Install')).toBeInTheDocument()
expect(screen.getByText('Install (pip)')).toBeInTheDocument()
})

it('should let the user find another Python interpreter to install DVC when the Python extension is not installed', () => {
Expand Down Expand Up @@ -215,7 +215,7 @@ describe('App', () => {
pythonBinPath: 'python'
})

const button = screen.getByText('Install')
const button = screen.getByText('Install (pip)')
fireEvent.click(button)

expect(mockPostMessage).toHaveBeenCalledWith({
Expand Down
2 changes: 1 addition & 1 deletion webview/src/setup/components/dvc/CliUnavailable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export const CliUnavailable: React.FC<PropsWithChildren> = ({ children }) => {
DVC & DVCLive can be auto-installed as packages with {pythonBinPath}
</p>
<div className={styles.sideBySideButtons}>
<Button onClick={installDvc} text="Install" />
<Button onClick={installDvc} text="Install (pip)" />
<Button onClick={setupWorkspace} text="Configure" />
</div>
</>
Expand Down
8 changes: 4 additions & 4 deletions webview/src/stories/Setup.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ CompletedConnected.args = getUpdatedArgs({
shareLiveToStudio: true
})

export const NoCLIPythonNotFound = Template.bind({})
NoCLIPythonNotFound.args = getUpdatedArgs({
export const CLIPythonNotFound = Template.bind({})
Copy link
Contributor Author

@julieg18 julieg18 May 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Noticed this typo while looking at storybook.

CLIPythonNotFound.args = getUpdatedArgs({
cliCompatible: undefined,
dvcCliDetails: {
command: 'dvc',
Expand All @@ -109,8 +109,8 @@ NoCLIPythonNotFound.args = getUpdatedArgs({
pythonBinPath: undefined
})

export const NoCLIPythonFound = Template.bind({})
NoCLIPythonFound.args = getUpdatedArgs({
export const CLIPythonFound = Template.bind({})
CLIPythonFound.args = getUpdatedArgs({
cliCompatible: undefined,
dvcCliDetails: {
command: '/opt/homebrew/Caskroom/miniforge/base/bin/python -m dvc',
Expand Down