Skip to content

Commit e7447a7

Browse files
committed
v1.3.1 - add Python 3.9 support classifier
1 parent 1710b82 commit e7447a7

File tree

4 files changed

+6
-10
lines changed

4 files changed

+6
-10
lines changed

mergedeep/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = "1.3.0"
1+
__version__ = "1.3.1"
22

33
from mergedeep.mergedeep import merge, Strategy
44

mergedeep/test_mergedeep.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def test_should_merge_3_dicts_into_new_dict_using_replace_strategy_and_only_muta
2121
"e": {1: 2, "a": {"f": 2}},
2222
"f": [4, 5, 6],
2323
"g": (100, 200),
24-
"h": Counter({"a": 1, "b": 1, "c": 1}),
24+
"h": Counter({"a": 5, "b": 1, "c": 1}),
2525
"i": 2,
2626
"j": Counter({"z": 2}),
2727
"z": Counter({"a": 2}),
@@ -44,7 +44,7 @@ def test_should_merge_3_dicts_into_new_dict_using_replace_strategy_and_only_muta
4444
"e": 2,
4545
"f": [4, 5, 6],
4646
"g": (100, 200),
47-
"h": Counter({"a": 1, "c": 1}),
47+
"h": Counter({"a": 5, "c": 1}),
4848
"i": Counter({"a": 1}),
4949
"z": Counter({"a": 2}),
5050
}

setup.cfg

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[metadata]
2+
version = attr: mergedeep.__version__

setup.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import re
2-
31
import setuptools, os
42

53

@@ -8,16 +6,11 @@ def open_local(paths, mode="r", encoding="utf8"):
86
return open(path, mode=mode, encoding=encoding)
97

108

11-
with open_local(["mergedeep", "__init__.py"]) as f:
12-
version = re.search(r"__version__ = [\"'](\d+\.\d+\.\d+)[\"']", f.read()).group(1)
13-
149
with open_local(["README.md"]) as f:
1510
long_description = f.read()
1611

17-
1812
setuptools.setup(
1913
name="mergedeep",
20-
version=version,
2114
author="Travis Clarke",
2215
author_email="travis.m.clarke@gmail.com",
2316
description="A deep merge function for 🐍.",
@@ -31,6 +24,7 @@ def open_local(paths, mode="r", encoding="utf8"):
3124
"Programming Language :: Python :: 3.6",
3225
"Programming Language :: Python :: 3.7",
3326
"Programming Language :: Python :: 3.8",
27+
"Programming Language :: Python :: 3.9",
3428
"License :: OSI Approved :: MIT License",
3529
"Operating System :: OS Independent",
3630
),

0 commit comments

Comments
 (0)