Skip to content

Commit

Permalink
[py-tx] Unchain the versions (#1486)
Browse files Browse the repository at this point in the history
  • Loading branch information
Dcallies authored Dec 11, 2023
1 parent a9a1438 commit 19952df
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
28 changes: 14 additions & 14 deletions python-threatexchange/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@

all_extras = set(sum(extras_require.values(), []))
# We might not get any value from splitting these all out
extras_require["test"] = sorted({"pytest==7.2.1"} | all_extras)
extras_require["test"] = sorted({"pytest"} | all_extras)
extras_require["package"] = ["wheel==0.38.4"]
extras_require["lint"] = ["black==23.1.0"]
extras_require["lint"] = ["black"]
extras_require["types"] = [
"mypy==0.991",
"types-python-dateutil==2.8.19.6",
"types-requests==2.28.11.12",
"mypy==1.7.1",
"types-python-dateutil",
"types-requests",
]
extras_require["all"] = sorted(set(sum(extras_require.values(), [])))
# If you are developing pytx, use this install
Expand All @@ -55,15 +55,15 @@
url="https://www.github.com/facebook/ThreatExchange",
packages=find_packages(exclude=["tests*"]),
install_requires=[
"python-Levenshtein==0.20.9",
"requests==2.31.0",
"urllib3==1.26.18", # For allow_methods
"python-dateutil==2.8.2",
"dacite==1.7.0", # 0.18.0 broke our tests due to faulty caching
"Pillow==10.0.1", # pdq
"pdqhash==0.2.3", # pdq
"faiss-cpu==1.7.3", # faiss
"numpy==1.24.2", # faiss
"python-Levenshtein",
"requests",
"urllib3", # For allow_methods
"python-dateutil",
"dacite",
"Pillow", # pdq
"pdqhash", # pdq
"faiss-cpu", # faiss
"numpy", # faiss
],
extras_require=extras_require,
entry_points={
Expand Down
2 changes: 1 addition & 1 deletion python-threatexchange/threatexchange/cli/config_cmd.py
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ def __init__(
self.action = self.execute_list_collabs
elif import_collab is not None:
tmp_for_typing = import_collab
self.action = lambda s: self.execute_import(s, tmp_for_typing)
self.action = lambda settings: self.execute_import(settings, tmp_for_typing)

def execute(self, settings: CLISettings) -> None:
self.action(settings)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ def naive_fetch_merge(
for k, v in new.items():
new_v = cls.fetch_value_merge(old.get(k), v)
if new_v is None:
old.pop(k, None) # type: ignore
old.pop(k, None)
else:
old[k] = new_v

Expand Down

0 comments on commit 19952df

Please sign in to comment.