Skip to content

Commit baa8848

Browse files
committed
Manual merge
2 parents 1d5d50b + f21b256 commit baa8848

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+649
-192
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,15 @@ jobs:
6262
- name: Establish a cache for dependencies
6363
uses: actions/cache@v2
6464
with:
65-
path: ${HOME}/.local
65+
path: |
66+
~/.local
67+
~/.cache/pip
6668
key: ${{ runner.os }}
6769

6870
- name: Build
6971
run: |
7072
export PYTHONUSERBASE=${HOME}/.local
73+
pip install --user wheel
7174
pip install --user -r requirements.txt
7275
${PYTHONUSERBASE}/bin/pylint ${GITHUB_WORKSPACE}/mrmat_python_api_flask
7376
PYTHONPATH=${GITHUB_WORKSPACE} python -m pytest --cov=mrmat_python_api_flask

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,5 +246,5 @@ dmypy.json
246246

247247
# End of https://www.toptal.com/developers/gitignore/api/jetbrains,python
248248

249-
var/terraform/.terraform/
250-
var/terraform/.terraform.lock.hcl
249+
250+
.coverage

.idea/dataSources.xml

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/mrmat-python-api-flask.iml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/pylint.xml

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations/build.xml

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations/cui.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations/db_current.xml

Lines changed: 40 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations/db_downgrade.xml

Lines changed: 25 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations/db_revision.xml

Lines changed: 25 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)