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.

Sign up for GitHub

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

Updating for Python v3.10 #42

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Updating for Python v3.10 #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
cdf2e65
Update for 3.10
borcuttjahns Nov 29, 2022
d363b27
Fix
borcuttjahns Dec 9, 2022
3efacaf
Fix'
borcuttjahns Apr 27, 2023
72484b3
Merge pull request #1 from meyer-lab/Update
borcuttjahns Apr 27, 2023
55ffb71
Fix2
borcuttjahns Apr 27, 2023
bddca14
Merge pull request #2 from meyer-lab/Fix2
borcuttjahns Apr 27, 2023
830fb38
Fix3
borcuttjahns Apr 27, 2023
a139219
Merge pull request #3 from meyer-lab/Fix3
borcuttjahns Apr 27, 2023
d52968d
TryThis
borcuttjahns Apr 27, 2023
38d8b6c
Try this
borcuttjahns Apr 27, 2023
9e8d76a
Try this 2
borcuttjahns Apr 27, 2023
6c26a87
Try this 2
borcuttjahns Apr 27, 2023
de41a82
Try this 4
borcuttjahns Apr 27, 2023
c98e227
Try this 4
borcuttjahns Apr 27, 2023
49b2f94
Debug
borcuttjahns Apr 27, 2023
4a48da2
Fixed
borcuttjahns Apr 27, 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
10 changes: 9 additions & 1 deletion FlowCytometryTools/core/bases.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def queueable(fun, *args, **kwargs):
'"%s" must be a parameter of queued function "%s"' % (_now, fun.__name__)
)
f_name = fun.__name__
kw_name = inspect.getargspec(fun).keywords
kw_name = inspect.getfullargspec(fun).varkw
kws = params.pop(kw_name, {})
params.update(kws)
if params[_now]:
Expand Down Expand Up @@ -368,6 +368,14 @@ def apply(self, func, applyto="measurement", noneval=nan, setdata=False):


Well = Measurement
import collections
try:
from collections import abc
collections.MutableMapping = abc.MutableMapping
collections.Iterable = abc.Iterable
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@borcuttjahns, are these transfers from abc.X to collections.X needed somewhere? I couldn't find a place where they are used.

Copy link

Choose a reason for hiding this comment

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

Hello, I am having issues running this code and it seams to be localized to this same issue you are talking about here. I was wondering if you found a solution.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@DavidGorlin this branch should fix the issue. It's what we currently use.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Or do you mean the code here is erroring?

collections.Mapping = abc.Mapping
except:
pass


class MeasurementCollection(abc.MutableMapping, BaseObject):
Expand Down
4 changes: 2 additions & 2 deletions FlowCytometryTools/core/containers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,11 @@ def plot(
plot_output = graph.plotFCM(self.data, channel_names, kind=kind, **kwargs)

if gates is not None:

if gate_colors is None:
gate_colors = cycle(("b", "g", "r", "m", "c", "y"))

if not isinstance(gate_lw, collections.Iterable):
gate_lw = [gate_lw]
gate_lw = [gate_lw]

gate_lw = cycle(gate_lw)

Expand Down