Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI #1036

Merged
merged 34 commits into from
Apr 18, 2023
Merged

Fix CI #1036

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
4489ee7
Add testing with pip; remove MacOS EDM tests.
corranwebster Apr 17, 2023
30212a0
Versions are strings.
corranwebster Apr 17, 2023
ff405a6
Actuall install toolkits!
corranwebster Apr 17, 2023
114ba74
Use pyface.ui.qt4 imports for now.
corranwebster Apr 17, 2023
738257b
Celiagg isn't special
corranwebster Apr 17, 2023
a2a2a33
Ranges should be ints.
corranwebster Apr 17, 2023
fda6961
And position of scrollbar should also be an int.
corranwebster Apr 17, 2023
f75598f
Revert change to ScrollbarRange; fix linux dependencies.
corranwebster Apr 17, 2023
5fe2e2a
Merge branch 'main' into fix/update-ci
corranwebster Apr 17, 2023
f79c8fe
Didtch PyQt5 for now.
corranwebster Apr 17, 2023
a1f0df0
Add support for cairo tests.
corranwebster Apr 17, 2023
cccb89e
Fix typo in cairo backend
corranwebster Apr 17, 2023
90e5bf8
Fix quad Bezier on Cairo backend.
corranwebster Apr 17, 2023
9819033
Expect Cairo drawing to fail -see #1035
corranwebster Apr 17, 2023
6cd6b3f
Improve workflow and update steuptools version.
corranwebster Apr 17, 2023
6818f41
Separate celiagg install.
corranwebster Apr 17, 2023
5d8332d
Add Mac (celiagg may be problematic).
corranwebster Apr 17, 2023
9ffd788
Different tests for linux vs. not linux
corranwebster Apr 17, 2023
e16faff
Some fixes for test running in OS X and Windows
corranwebster Apr 17, 2023
53c9e7a
Add windows to test matrix.
corranwebster Apr 18, 2023
562ab77
Fiddle with pip upgrade - windows seems unhappy.
corranwebster Apr 18, 2023
37b9ca8
Windows needs python -m pip?
corranwebster Apr 18, 2023
a294751
Experiment with wx in the matrix.
corranwebster Apr 18, 2023
bed7561
Exclude old linux wx from matrix.
corranwebster Apr 18, 2023
ac213a7
`Exclude` is inside `matrix`
corranwebster Apr 18, 2023
fc175c9
Turn off wx on linux completely
corranwebster Apr 18, 2023
a11d58b
Drop Wx + MacOS (no wheels); add PyQt5 + Python 3.8
corranwebster Apr 18, 2023
199b3cb
Cant handle multiple cases in an exclude.
corranwebster Apr 18, 2023
2699c5c
Update all workflows; skip Windows/PyQt5 for now #1308
corranwebster Apr 18, 2023
f8d08dc
Don't test on EDM Mac due to AVX2 issue
corranwebster Apr 18, 2023
0a4be6f
Use https for git checkouts rather than http.
corranwebster Apr 18, 2023
210a3a5
Spell celiagg correctly
corranwebster Apr 18, 2023
35d098f
Update kiva/cairo.py
corranwebster Apr 18, 2023
0185b20
Normalize quotes.
corranwebster Apr 18, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert change to ScrollbarRange; fix linux dependencies.
  • Loading branch information
corranwebster committed Apr 17, 2023
commit f75598fc49ad849692d3d0db8206bacde76ce987
2 changes: 1 addition & 1 deletion .github/workflows/test-with-pip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
sudo apt-get install libglu1-mesa-dev
# needed for Celiagg
sudo apt-get install libfreetype-dev libharfbuzz-dev
if: matrix.os == 'linux'
if: matrix.os == 'ubuntu-latest'
- name: Install build dependencies
run: |
python -m pip install -U pip wheel
Expand Down
8 changes: 4 additions & 4 deletions enable/enable_traits.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,10 +171,10 @@ def validate(self, object, name, value):
page_size = max(min(page_size, high - low), 0.0)
line_size = max(min(line_size, page_size), 0.0)
return (
int(low),
int(high),
int(page_size),
int(line_size),
float(low),
float(high),
float(page_size),
float(line_size),
)
except Exception:
self.error(object, name, value)
Expand Down
15 changes: 8 additions & 7 deletions enable/qt4/scrollbar.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,12 @@ def _update_control(self, enable_range, value):
# invert values for vertical ranges because of coordinate system issues
value = self._correct_value(value, minimum, max_value)

self._control.setMinimum(minimum)
self._control.setMaximum(max_value)
self._control.setValue(value)
self._control.setPageStep(page_size)
self._control.setSingleStep(line_size)
# Need explicit cast to int() for Python 3.10 + PyQt5
self._control.setMinimum(int(minimum))
self._control.setMaximum(int(max_value))
self._control.setValue(int(value))
self._control.setPageStep(int(page_size))
self._control.setSingleStep(int(line_size))

def _correct_value(self, value, min_value, max_value):
""" Correct vertical position values for Qt and Enable conventions
Expand All @@ -186,8 +187,8 @@ def _correct_value(self, value, min_value, max_value):
the scrolled component, less the page size).
"""
if self.orientation != "vertical":
return int(value)
return int(max_value - (value - min_value))
return value
return max_value - (value - min_value)

# ------------------------------------------------------------------------
# Qt Event handlers
Expand Down