Skip to content
This repository has been archived by the owner on Nov 30, 2023. It is now read-only.

Commit

Permalink
Merge pull request #15 from qubitron/master
Browse files Browse the repository at this point in the history
Python: adding back pylint, removing intellicode
  • Loading branch information
Chuxel committed Apr 22, 2019
2 parents cf5448d + 4c39480 commit 04e5a80
Show file tree
Hide file tree
Showing 14 changed files with 37 additions and 19 deletions.
8 changes: 6 additions & 2 deletions containers/python-2/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,15 @@ FROM python:2
# Copy endpoint specific user settings overrides into container to specify Python path
COPY .devcontainer/settings.vscode.json /root/.vscode-remote/data/Machine/settings.json

RUN pip install pylint

# Install git, process tools
RUN apt-get update && apt-get -y install git procps

RUN mkdir /workspace
WORKDIR /workspace

# Install pylint
RUN pip install pylint

# Install Python dependencies from requirements.txt if it exists
COPY .devcontainer/requirements.txt.temp requirements.txt* /workspace/
RUN if [ -f "requirements.txt" ]; then pip install -r requirements.txt && rm requirements.txt*; fi
Expand Down
3 changes: 1 addition & 2 deletions containers/python-2/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"dockerFile": "Dockerfile",
"workspaceFolder": "/workspace",
"extensions": [
"ms-python.python",
"VisualStudioExptTeam.vscodeintellicode"
"ms-python.python"
]
}
4 changes: 3 additions & 1 deletion containers/python-2/.devcontainer/settings.vscode.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
{
"python.pythonPath": "/usr/local/bin/python"
"python.pythonPath": "/usr/local/bin/python",
"python.linting.pylintEnabled": true,
"python.linting.enabled": true
}
3 changes: 1 addition & 2 deletions containers/python-3-anaconda/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"appPort": "5000:5000",
"workspaceFolder": "/workspace",
"extensions": [
"ms-python.python",
"VisualStudioExptTeam.vscodeintellicode"
"ms-python.python"
]
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
{
"python.pythonPath": "/opt/conda/bin/python"
"python.pythonPath": "/opt/conda/bin/python",
"python.linting.pylintEnabled": true,
"python.linting.enabled": true
}
3 changes: 3 additions & 0 deletions containers/python-3-miniconda/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ RUN apt-get update && apt-get -y install git procps
RUN mkdir /workspace
WORKDIR /workspace

# Install pylint
RUN pip install pylint

# Install Python dependencies from requirements.txt if it exists
COPY .devcontainer/environment.yml.temp environment.yml* /workspace/
RUN if [ -f "environment.yml" ]; then conda env update base -f environment.yml && rm environment.yml*; fi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"dockerFile": "Dockerfile",
"workspaceFolder": "/workspace",
"extensions": [
"ms-python.python",
"VisualStudioExptTeam.vscodeintellicode"
"ms-python.python"
]
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
{
"python.pythonPath": "/opt/conda/bin/python"
"python.pythonPath": "/opt/conda/bin/python",
"python.linting.pylintEnabled": true,
"python.linting.enabled": true
}
7 changes: 5 additions & 2 deletions containers/python-3-postgres/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,14 @@ COPY .devcontainer/settings.vscode.json /root/.vscode-remote/data/Machine/settin

ENV PYTHONUNBUFFERED 1

# Install git, process tools
RUN apt-get update && apt-get -y install git procps

RUN mkdir /workspace
WORKDIR /workspace

# Install git, process tools
RUN apt-get update && apt-get -y install git procps
# Install pylint
RUN pip install pylint

# Install Python dependencies from requirements.txt if it exists
COPY .devcontainer/requirements.txt.temp requirements.txt* /workspace/
Expand Down
3 changes: 1 addition & 2 deletions containers/python-3-postgres/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"service": "app",
"workspaceFolder": "/workspace",
"extensions": [
"ms-python.python",
"VisualStudioExptTeam.vscodeintellicode"
"ms-python.python"
]
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
{
"python.pythonPath": "/usr/local/bin/python"
"python.pythonPath": "/usr/local/bin/python",
"python.linting.pylintEnabled": true,
"python.linting.enabled": true
}
3 changes: 3 additions & 0 deletions containers/python-3/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ RUN apt-get update && apt-get -y install git procps
RUN mkdir /workspace
WORKDIR /workspace

# Install pylint
RUN pip install pylint

# Install Python dependencies from requirements.txt if it exists
COPY .devcontainer/requirements.txt.temp requirements.txt* /workspace/
RUN if [ -f "requirements.txt" ]; then pip install -r requirements.txt && rm requirements.txt*; fi
Expand Down
3 changes: 1 addition & 2 deletions containers/python-3/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"dockerFile": "Dockerfile",
"workspaceFolder": "/workspace",
"extensions": [
"ms-python.python",
"VisualStudioExptTeam.vscodeintellicode"
"ms-python.python"
]
}
4 changes: 3 additions & 1 deletion containers/python-3/.devcontainer/settings.vscode.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
{
"python.pythonPath": "/usr/local/bin/python"
"python.pythonPath": "/usr/local/bin/python",
"python.linting.pylintEnabled": true,
"python.linting.enabled": true
}

0 comments on commit 04e5a80

Please sign in to comment.