Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-pylib
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
caosdb
Software
caosdb-pylib
Commits
e042a85a
Commit
e042a85a
authored
1 year ago
by
Florian Spreckelsen
Browse files
Options
Downloads
Plain Diff
Merge branch 'f-mypy' into 'dev'
F mypy See merge request
!66
parents
57f8bdc8
9690bf58
No related branches found
No related tags found
2 merge requests
!143
Release 0.15.0
,
!66
F mypy
Pipeline
#48928
failed
1 year ago
Stage: code_style
Stage: linting
Stage: test
Stage: deploy
Changes
4
Pipelines
2
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+10
-1
10 additions, 1 deletion
.gitlab-ci.yml
Makefile
+5
-1
5 additions, 1 deletion
Makefile
tox.ini
+1
-0
1 addition, 0 deletions
tox.ini
unittests/docker/Dockerfile
+1
-1
1 addition, 1 deletion
unittests/docker/Dockerfile
with
17 additions
and
3 deletions
.gitlab-ci.yml
+
10
−
1
View file @
e042a85a
...
@@ -29,9 +29,9 @@ variables:
...
@@ -29,9 +29,9 @@ variables:
image
:
$CI_REGISTRY_IMAGE
image
:
$CI_REGISTRY_IMAGE
stages
:
stages
:
-
setup
-
code_style
-
code_style
-
linting
-
linting
-
setup
-
test
-
test
-
deploy
-
deploy
...
@@ -53,6 +53,14 @@ pylint:
...
@@ -53,6 +53,14 @@ pylint:
-
make lint
-
make lint
allow_failure
:
true
allow_failure
:
true
mypy
:
tags
:
[
docker
]
stage
:
linting
script
:
-
pip install mypy types-PyYAML types-jsonschema types-requests types-setuptools types-lxml types-python-dateutil
-
make mypy
allow_failure
:
true
# run unit tests
# run unit tests
unittest_py3.7
:
unittest_py3.7
:
tags
:
[
docker
]
tags
:
[
docker
]
...
@@ -142,6 +150,7 @@ build-testenv:
...
@@ -142,6 +150,7 @@ build-testenv:
stage
:
setup
stage
:
setup
only
:
only
:
-
schedules
-
schedules
-
web
script
:
script
:
-
cd unittests/docker
-
cd unittests/docker
-
docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-
docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
...
...
This diff is collapsed.
Click to expand it.
Makefile
+
5
−
1
View file @
e042a85a
...
@@ -32,7 +32,7 @@ doc:
...
@@ -32,7 +32,7 @@ doc:
install
:
install
:
@
echo
"Not implemented yet, use pip for installation."
@
echo
"Not implemented yet, use pip for installation."
check
:
style lint
check
:
style lint
mypy
.PHONY
:
check
.PHONY
:
check
style
:
style
:
...
@@ -43,6 +43,10 @@ lint:
...
@@ -43,6 +43,10 @@ lint:
pylint
--unsafe-load-any-extension
=
y
-d
all
-e
E,F src/linkahead/common
pylint
--unsafe-load-any-extension
=
y
-d
all
-e
E,F src/linkahead/common
.PHONY
:
lint
.PHONY
:
lint
mypy
:
mypy src/linkahead
.PHONY
:
mypy
unittest
:
unittest
:
tox
-r
tox
-r
.PHONY
:
unittest
.PHONY
:
unittest
This diff is collapsed.
Click to expand it.
tox.ini
+
1
−
0
View file @
e042a85a
...
@@ -7,6 +7,7 @@ deps = .
...
@@ -7,6 +7,7 @@ deps = .
pynose
pynose
pytest
pytest
pytest-cov
pytest-cov
mypy
jsonschema>=4.4.0
jsonschema>=4.4.0
setuptools
setuptools
commands
=
py.test --cov=caosdb -vv {posargs}
commands
=
py.test --cov=caosdb -vv {posargs}
...
...
This diff is collapsed.
Click to expand it.
unittests/docker/Dockerfile
+
1
−
1
View file @
e042a85a
...
@@ -12,4 +12,4 @@ ARG COMMIT="dev"
...
@@ -12,4 +12,4 @@ ARG COMMIT="dev"
# TODO Rename to linkahead
# TODO Rename to linkahead
RUN
git clone
-b
dev https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git linkahead-pylib
&&
\
RUN
git clone
-b
dev https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git linkahead-pylib
&&
\
cd
linkahead-pylib
&&
git checkout
$COMMIT
&&
pip3
install
.
cd
linkahead-pylib
&&
git checkout
$COMMIT
&&
pip3
install
.
RUN
pip3
install
recommonmark sphinx-rtd-theme
RUN
pip3
install
recommonmark sphinx-rtd-theme
mypy
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment