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

setuptools plugin solution for variables #1121

Closed
wants to merge 15 commits into from
Closed

setuptools plugin solution for variables #1121

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f124a4b
start on pluggy solution for variables
fgregg Dec 10, 2022
94ff569
removed unused imports
fgregg Dec 10, 2022
83d0ec5
check setuptools entrypoints
fgregg Dec 11, 2022
a954079
move typify back out of datamodel class
fgregg Dec 11, 2022
30ea77c
release candidate
fgregg Dec 11, 2022
82e70d3
version 3.0
fgregg Dec 11, 2022
ea2924f
don't require version ofdedupe-variable-datetime that doesn't exist yet
fgregg Dec 11, 2022
0b66537
stray line noise
fgregg Dec 11, 2022
0c7943e
plugins without pluggy
fgregg Dec 11, 2022
d2db6b0
__all__ needs to be strings
fgregg Dec 11, 2022
39dc321
don't need to also install dedupe.variables as sep lib
fgregg Dec 11, 2022
79d41f8
build without special compat args
fgregg Dec 11, 2022
b844561
Merge branch 'main' into pluggy-variables
fgregg Dec 11, 2022
14d9970
colorize
fgregg Dec 11, 2022
784bf63
Merge branch 'main' into pluggy-variables
fgregg Dec 12, 2022
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
5 changes: 4 additions & 1 deletion dedupe/datamodel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,10 @@ def typify_variables(
variable_definitions: Iterable[VariableDefinition],
) -> tuple[list[FieldVariable], list[Variable]]:

variable_types = {variable.type: variable for variable in dedupe.variables.__all__}
variable_types = {}
for variablename in dedupe.variables.__all__:
Copy link
Contributor

Choose a reason for hiding this comment

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

If you copied this from my PR, I'm not positive that all is actually the correct solution, perhaps I'm abusing it and it actually is intended for something else.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it's intended use is to control the behavior of "import *" but i think this works fine.

variable = getattr(dedupe.variables, variablename)
variable_types[variable.type] = variable

plugin_vars = load_setuptools_entrypoints("dedupevariables")
for var in plugin_vars:
Expand Down
22 changes: 11 additions & 11 deletions dedupe/variables/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
from dedupe.variables.string import ShortStringType, StringType, TextType

__all__ = [
CustomType,
CategoricalType,
ExactType,
ExistsType,
InteractionType,
LatLongType,
PriceType,
SetType,
ShortStringType,
StringType,
TextType,
"CustomType",
"CategoricalType",
"ExactType",
"ExistsType",
"InteractionType",
"LatLongType",
"PriceType",
"SetType",
"ShortStringType",
"StringType",
"TextType",
]