Skip to content

Commit

Permalink
Merge pull request #100 from TomerFi/update-aioswitcher
Browse files Browse the repository at this point in the history
Update aioswitcher
  • Loading branch information
TomerFi authored Aug 31, 2020
2 parents 4ec9fd5 + 51e9b6b commit a626d41
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 14 deletions.
22 changes: 16 additions & 6 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,28 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
ENV SHELL=/bin/bash \
PATH=$PATH:/opt/gopath/bin:/opt/go/bin

# Install linux packages
RUN apt-get update \
&& apt-get install -y --no-install-recommends git-lfs \
&& apt-get install -y --no-install-recommends nano \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

# Install nodejs (includes npm)
RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - \
&& apt-get install -y --no-install-recommends nodejs=14.3.0-1nodesource1 \
&& apt-get install -y --no-install-recommends nodejs \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

# Install golang
WORKDIR /opt/go
RUN curl -sOL https://dl.google.com/go/go1.14.2.linux-amd64.tar.gz \
&& tar -C /opt -xf go1.14.2.linux-amd64.tar.gz \
&& rm go1.14.2.linux-amd64.tar.gz \
RUN curl -sOL https://dl.google.com/go/go1.14.4.linux-amd64.tar.gz \
&& tar -C /opt -xf go1.14.4.linux-amd64.tar.gz \
&& rm go1.14.4.linux-amd64.tar.gz \
&& bin/go env -w GOPATH=/opt/gopath GO111MODULE=on

# Install hadolint
RUN curl -sL https://github.com/hadolint/hadolint/releases/download/v1.17.6/hadolint-Linux-x86_64 \
RUN curl -sL https://github.com/hadolint/hadolint/releases/download/v1.18.0/hadolint-Linux-x86_64 \
-o /usr/local/bin/hadolint \
&& chmod +x /usr/local/bin/hadolint

Expand All @@ -32,7 +39,10 @@ COPY requirements.txt ./
# Install modules, requirements, dependencies, packages, libraries etc.
RUN \
# Install node modules
npm install -g [email protected] \
npm install -g \
[email protected] \
@commitlint/[email protected] \
@commitlint/[email protected] \
# Install golang modules
&& go get -u github.com/client9/misspell/cmd/[email protected] \
# Install python dependencies
Expand Down
9 changes: 7 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
},
"extensions": [
"ms-python.python",
"ms-azuretools.vscode-docker"
]
"ms-azuretools.vscode-docker",
"editorconfig.editorconfig",
"littlefoxteam.vscode-python-test-adapter",
"magicstack.magicpython",
"visualstudioexptteam.vscodeintellicode"
],
"postCreateCommand": "pip install --upgrade pip && pip install -r requirements.txt"
}
2 changes: 1 addition & 1 deletion .devcontainer/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
aiohttp==3.6.2
aioswitcher==1.2.0
aioswitcher==1.2.1
asynctest==0.13.0
bandit==1.6.2
beautifulsoup4==4.9.1
Expand Down
3 changes: 3 additions & 0 deletions .hadolint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
ignored:
- DL3008
14 changes: 14 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"recommendations": [
"eamodio.gitlens",
"donjayamanne.githistory",
"davidanson.vscode-markdownlint",
"shardulm94.trailing-spaces",
"coenraads.bracket-pair-colorizer-2",
"oderwat.indent-rainbow",
"wakatime.vscode-wakatime",
"bierner.markdown-emoji",
"njpwerner.autodocstring",
"lextudio.restructuredtext"
]
}
10 changes: 5 additions & 5 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"type": "shell",
"command": "pip install -rrequirements.txt",
"group": {
"kind": "build",
"isDefault": true
"kind": "build",
"isDefault": true
}
},
{
Expand All @@ -24,8 +24,8 @@
"type": "shell",
"command": "pytest -vs --cov --cov-config=.coveragerc",
"group": {
"kind": "test",
"isDefault": true
"kind": "test",
"isDefault": true
},
"dependsOn": ["Install build requirements"]
},
Expand Down Expand Up @@ -97,4 +97,4 @@
"group": "test"
}
]
}
}

0 comments on commit a626d41

Please sign in to comment.