Skip to content

Commit

Permalink
Merge pull request Nitrokey#165 from Nitrokey/fix-ci-requirements
Browse files Browse the repository at this point in the history
Sync dependency lists
  • Loading branch information
daringer authored Jan 27, 2022
2 parents 51e5821 + be4d5c1 commit e3df591
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ build-msi:
script:
- make wine-build
after_script:
- - wget $icon_server/checkmark/$CI_COMMIT_REF_NAME/$CI_COMMIT_SHA/$CI_JOB_NAME/$CI_JOB_STATUS/${CI_JOB_URL#*/*/*/}
- wget $icon_server/checkmark/$CI_COMMIT_REF_NAME/$CI_COMMIT_SHA/$CI_JOB_NAME/$CI_JOB_STATUS/${CI_JOB_URL#*/*/*/} || true
- mkdir -p artifacts
- cp wine-build/*.exe artifacts
- cp wine-build/*.msi artifacts
Expand All @@ -59,4 +59,4 @@ build-and-publish-pypi:
script:
- make CI
- sed -e "s|\${passw}|$PYPI_TOKEN|" ci-scripts/.pypirc_tamplate > ~/.pypirc
- make publish
- make publish
3 changes: 2 additions & 1 deletion ci-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ spsdk>=1.5.0
tqdm
urllib3
cffi

cbor
nkdfu
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ requires = [
"spsdk >= 1.5.0",
"tqdm",
"urllib3",
"cffi",
"cbor",
"nkdfu"
"cffi",
"cbor",
"nkdfu",
]
classifiers=[
"License :: OSI Approved :: MIT License",
Expand Down

0 comments on commit e3df591

Please sign in to comment.