Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
zerasul committed May 8, 2021
2 parents ea71086 + 174d5eb commit 5abd33d
Show file tree
Hide file tree
Showing 5 changed files with 246 additions and 197 deletions.
9 changes: 9 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
version: 2
updates:
- package-ecosystem: pip
directory: "/"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 10
target-branch: develop
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:

env:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
ACTIONS_ALLOW_UNSECURE_COMMANDS: true

jobs:
test:
Expand All @@ -16,10 +17,10 @@ jobs:
- name: Clone repo
uses: actions/checkout@v2

- name: Setup python 3.6
- name: Setup python 3.7
uses: actions/setup-python@v2
with:
python-version: '3.6' # Version range or exact version of a Python version to use, using SemVer's version range syntax
python-version: '3.7' # Version range or exact version of a Python version to use, using SemVer's version range syntax
architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified

- name: Setup sonarqube
Expand Down
4 changes: 2 additions & 2 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ url = "https://pypi.python.org/simple"
[packages]
click = ">=6.7"
coveralls = ">=1.3.0"
cryptography = ">=2.6.1"
cryptography = ">=3.3.2"
flask = ">=1.1.1"
markdown = ">=2.6.11"
pygments = ">=2.2.0"
Expand All @@ -23,4 +23,4 @@ python_version = "python 3.7"
[scripts]

test = "pytest --cov=blask --cov-report=xml"
linter = "pylint blask --exit-zero"
linter = "pylint blask --exit-zero"
Loading

0 comments on commit 5abd33d

Please sign in to comment.