Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
py_tools_ds
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
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
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Daniel Scheffler
py_tools_ds
Commits
87699b6e
Commit
87699b6e
authored
3 years ago
by
Daniel Scheffler
Browse files
Options
Downloads
Patches
Plain Diff
Removed everything related to nosetests.
parent
8869a764
No related branches found
No related tags found
1 merge request
!33
migrate test calls to pytest
Pipeline
#35163
failed
3 years ago
Stage: test
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
Makefile
+1
-10
1 addition, 10 deletions
Makefile
setup.py
+1
-2
1 addition, 2 deletions
setup.py
tests/CI_docker/context/environment_py_tools_ds.yml
+0
-5
0 additions, 5 deletions
tests/CI_docker/context/environment_py_tools_ds.yml
with
2 additions
and
17 deletions
Makefile
+
1
−
10
View file @
87699b6e
.PHONY
:
clean clean-test clean-pyc clean-build docs help
nosetests
pytest
.PHONY
:
clean clean-test clean-pyc clean-build docs help pytest
.DEFAULT_GOAL
:=
help
define
BROWSER_PYSCRIPT
import
os,
webbrowser,
sys
...
...
@@ -52,8 +52,6 @@ clean-test: ## remove test and coverage artifacts
rm
-fr
report.html
rm
-fr
report.xml
rm
-fr
coverage.xml
rm
-fr
nosetests.html
rm
-fr
nosetests.xml
lint
:
##
check style with flake8
flake8
--max-line-length
=
120 py_tools_ds tests
>
./tests/linting/flake8.log
||
\
...
...
@@ -80,13 +78,6 @@ coverage: ## check code coverage quickly with the default Python
coverage html
#
$(
BROWSER
)
htmlcov/index.html
nosetests
:
clean-test
##
Runs nosetests with coverage
,
xUnit and nose-html-output
## - puts the coverage results in the folder 'htmlcov'
## - generates 'nosetests.html'
(
--with-html
)
## - generates 'nosetests.xml'
(
--with-xunit
)
which is currently not visualizable by GitLab
nosetests
-vv
--with-coverage
--cover-package
=
py_tools_ds
--cover-erase
--cover-html
--cover-html-dir
=
htmlcov
\
--with-html
--with-xunit
--rednose
--force-color
pytest
:
clean-test
##
Runs pytest with coverage and creates coverage and test report
## - puts the coverage results in the folder 'htmlcov'
## - generates cobertura 'coverage.xml'
(
needed to show coverage
in
GitLab MR changes
)
...
...
This diff is collapsed.
Click to expand it.
setup.py
+
1
−
2
View file @
87699b6e
...
...
@@ -48,8 +48,7 @@ requirements = [
'
spectral
'
]
setup_requirements
=
[
'
setuptools
'
]
test_requirements
=
requirements
+
[
"
coverage
"
,
"
gdal
"
,
"
nose
"
,
"
nose2
"
,
"
nose-htmloutput
"
,
"
pytest
"
,
"
pytest-cov
"
,
"
pytest-reporter-html1
"
,
"
rednose
"
,
"
shapely
"
,
"
urlchecker
"
]
test_requirements
=
requirements
+
[
"
gdal
"
,
"
pytest
"
,
"
pytest-cov
"
,
"
pytest-reporter-html1
"
,
"
shapely
"
,
"
urlchecker
"
]
setup
(
name
=
'
py_tools_ds
'
,
...
...
This diff is collapsed.
Click to expand it.
tests/CI_docker/context/environment_py_tools_ds.yml
+
0
−
5
View file @
87699b6e
...
...
@@ -16,17 +16,12 @@ dependencies:
-
pip
:
-
spectral
-
coverage
-
flake8
-
nose
-
nose2
-
nose-htmloutput
-
pycodestyle
-
pydocstyle
-
pylint
-
pytest
-
pytest-cov
-
pytest-reporter-html1
-
rednose
-
sphinx-argparse
-
urlchecker
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