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

Upgrade cvxopt #348

Merged
merged 7 commits into from
Aug 7, 2023
Merged

Upgrade cvxopt #348

merged 7 commits into from
Aug 7, 2023

Conversation

paddyroddy
Copy link
Collaborator

@paddyroddy paddyroddy commented Jul 20, 2023

As of 1.3.1 cvxopt now has Arm wheels.

Also upgrade pre-commit and fixed appropriate things.

@paddyroddy paddyroddy self-assigned this Jul 20, 2023
@deprecated-napari-hub-preview-bot
Copy link

deprecated-napari-hub-preview-bot bot commented Jul 20, 2023

Preview page for your plugin is ready here:
https://preview.napari-hub.org/quantumjot/btrack/348
Updated: 2023-07-21T12:17:07.045215

pyproject.toml Outdated Show resolved Hide resolved
@paddyroddy paddyroddy changed the title Upgrade cvxopt - hopefully can remove conda Upgrade cvxopt Jul 20, 2023
@codecov-commenter
Copy link

codecov-commenter commented Jul 20, 2023

Codecov Report

Patch coverage: 80.00% and project coverage change: +0.09% 🎉

Comparison is base (009622b) 85.91% compared to head (31d3063) 86.00%.

❗ Current head 31d3063 differs from pull request most recent head 1e8880e. Consider uploading reports for the commit 1e8880e to get more accurate results

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #348      +/-   ##
==========================================
+ Coverage   85.91%   86.00%   +0.09%     
==========================================
  Files          30       30              
  Lines        2172     2165       -7     
  Branches      396      393       -3     
==========================================
- Hits         1866     1862       -4     
+ Misses        225      223       -2     
+ Partials       81       80       -1     
Files Changed Coverage Δ
btrack/io/exporters.py 72.22% <ø> (ø)
btrack/io/hdf.py 76.34% <42.85%> (-0.09%) ⬇️
btrack/btypes.py 83.65% <90.90%> (+1.10%) ⬆️
btrack/config.py 96.77% <100.00%> (-0.11%) ⬇️
btrack/io/_localization.py 90.35% <100.00%> (-0.09%) ⬇️
btrack/optimise/hypothesis.py 100.00% <100.00%> (ø)

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@paddyroddy paddyroddy marked this pull request as ready for review July 20, 2023 17:07
Copy link
Owner

@quantumjot quantumjot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Couple of comments

btrack/btypes.py Show resolved Hide resolved
btrack/btypes.py Outdated Show resolved Hide resolved
btrack/io/exporters.py Outdated Show resolved Hide resolved
@paddyroddy paddyroddy merged commit 44a1187 into main Aug 7, 2023
5 checks passed
@paddyroddy paddyroddy deleted the upgrade-cvxopt branch August 7, 2023 15:35
p-j-smith pushed a commit that referenced this pull request Aug 8, 2023
* Update `pre-commit` and make some other fixes

* Update version pins

* Remove references to `cvxopt`

* Add type

Co-authored-by: Alan R Lowe <[email protected]>

* Use `|=`

* Remove extra dependencies

---------

Co-authored-by: Alan R Lowe <[email protected]>
p-j-smith added a commit that referenced this pull request Aug 8, 2023
* Update plugin reader to return early for unsupported filetypes

* Add a function btrack.utils.napari_to_tracks

Converts napari layer data into a list of Tracklets

* Add hdf writer function to the plugin

* Add plugin writer to napari config

* Use empty dict for graph and properties if they are not layer metadata

* Determine parent, root, and children from graph if it exists

* Make black happy

* Add the tracks.h5 example dataset

* Set correct parent, root, and generation when converting napari to track

* Add test for btrack.utils.napari_to_tracks

The z-coordinates are not compared as dummy objects in the sample set have non-zero values even though it's a 2D dataset

* Use constants.States enum when setting default label rather int literal

Also inherit from enum.IntEnum for constants.States otherwise numpy complains that it can't be used to set as a fill value with np.full_like

* Upgrade `cvxopt` (#348)

* Update `pre-commit` and make some other fixes

* Update version pins

* Remove references to `cvxopt`

* Add type

Co-authored-by: Alan R Lowe <[email protected]>

* Use `|=`

* Remove extra dependencies

---------

Co-authored-by: Alan R Lowe <[email protected]>

* Move `fixture`s into `conftest.py` (#331)

* Move `fixture`s into `conftest.py`

* Just import `btrack`

* Move `Container`

* Fix tests

* Rename writer

* Use `qtpy`

* Don't set widget values in the widgets (as done from file)  (#379)

* Remove unnecessary `.setValue` calls

* Check status done by config file

* Don't store refs when converting tracks to napari

* Fix description of return values from napari_to_tracks

---------

Co-authored-by: Patrick Roddy <[email protected]>
Co-authored-by: Alan R Lowe <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants