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
1fdae873
Commit
1fdae873
authored
5 years ago
by
hagrid67
Browse files
Options
Downloads
Patches
Plain Diff
set DISPLAY in tox.ini for tk tests with window
parent
2acd8cf1
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Makefile
+8
-1
8 additions, 1 deletion
Makefile
flatland/utils/graphics_pil.py
+1
-1
1 addition, 1 deletion
flatland/utils/graphics_pil.py
tox.ini
+1
-0
1 addition, 0 deletions
tox.ini
with
10 additions
and
2 deletions
Makefile
+
8
−
1
View file @
1fdae873
...
...
@@ -53,8 +53,15 @@ clean-test: ## remove test and coverage artifacts
lint
:
##
check style with flake8
flake8 flatland tests
test
:
export DISPLAY = :0
test
:
##
run tests quickly with the default Python
export
DISPLAY
=
:0.0
echo
"
$$
DISPLAY"
py.test
jw
:
export DISPLAY = :0.0
jw
:
echo
"
$$
DISPLAY"
py.test
test-all
:
##
run tests on every Python version with tox
...
...
This diff is collapsed.
Click to expand it.
flatland/utils/graphics_pil.py
+
1
−
1
View file @
1fdae873
...
...
@@ -86,7 +86,7 @@ class PILGL(GraphicsLayer):
def
create_layer
(
self
,
iLayer
=
0
):
if
len
(
self
.
layers
)
<=
iLayer
:
for
i
in
range
(
len
(
self
.
layers
),
iLayer
+
1
):
if
i
==
0
:
if
i
==
0
:
opacity
=
255
# "bottom" layer is opaque (for rails)
else
:
opacity
=
0
# subsequent layers are transparent
...
...
This diff is collapsed.
Click to expand it.
tox.ini
+
1
−
0
View file @
1fdae873
...
...
@@ -28,6 +28,7 @@ commands = make coverage
[testenv]
setenv
=
PYTHONPATH
=
{toxinidir}
DISPLAY
=
:0
deps
=
-r{toxinidir}/requirements_dev.txt
; If you want to make tox run the tests with the same versions, create a
...
...
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