Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Flatland
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
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
sfwatergit
Flatland
Commits
81ba8e05
Commit
81ba8e05
authored
5 years ago
by
u214892
Browse files
Options
Downloads
Patches
Plain Diff
cleanup continuous integration
parent
018aee2d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
requirements_continuous_integration.txt
+1
-0
1 addition, 0 deletions
requirements_continuous_integration.txt
requirements_dev.txt
+1
-1
1 addition, 1 deletion
requirements_dev.txt
tox.ini
+3
-3
3 additions, 3 deletions
tox.ini
with
5 additions
and
4 deletions
requirements_continuous_integration.txt
+
1
−
0
View file @
81ba8e05
# contains all additional requirements to run the ```tox .``` in addition to requirements_dev.txt for ```tox -e py37,py37```
bumpversion==0.5.3
bumpversion==0.5.3
wheel==0.32.1
wheel==0.32.1
watchdog==0.9.0
watchdog==0.9.0
...
...
This diff is collapsed.
Click to expand it.
requirements_dev.txt
+
1
−
1
View file @
81ba8e05
# contains
# contains
all requirements to run the tests by running ```tox -e py36,py37```
tox==3.5.2
tox==3.5.2
twine==1.12.1
twine==1.12.1
pytest==3.8.2
pytest==3.8.2
...
...
This diff is collapsed.
Click to expand it.
tox.ini
+
3
−
3
View file @
81ba8e05
...
@@ -56,6 +56,9 @@ passenv =
...
@@ -56,6 +56,9 @@ passenv =
HTTP_PROXY
HTTP_PROXY
HTTPS_PROXY
HTTPS_PROXY
whitelist_externals
=
sh
whitelist_externals
=
sh
deps
=
-r{toxinidir}/requirements_dev.txt
-r{toxinidir}/requirements_continuous_integration.txt
commands
=
commands
=
sh
-c
'ls
benchmarks/*.py
|
xargs
-n
1
python'
sh
-c
'ls
benchmarks/*.py
|
xargs
-n
1
python'
...
@@ -71,9 +74,6 @@ passenv =
...
@@ -71,9 +74,6 @@ passenv =
HTTPS_PROXY
HTTPS_PROXY
deps
=
deps
=
-r{toxinidir}/requirements_dev.txt
-r{toxinidir}/requirements_dev.txt
; If you want to make tox run the tests with the same versions, create a
; requirements.txt with the pinned versions and uncomment the following line:
; -r{toxinidir}/requirements.txt
commands
=
commands
=
sh
-c
'echo
DISPLAY:
$DISPLAY'
sh
-c
'echo
DISPLAY:
$DISPLAY'
py.test
--basetemp
=
{envtmpdir}
py.test
--basetemp
=
{envtmpdir}
...
...
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