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

SIANXKE-411: Update Python and package versions #2

Merged
merged 1 commit into from
Nov 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: '3.9'
python-version: '3.13'
architecture: 'x64'

- name: Install dependencies and package
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,17 @@ jobs:
fail-fast: false
matrix:
python-version:
- "3.7"
- "3.8"
- "3.9"
- "3.10"
- "3.11"
- "3.12"
- "3.13"

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -40,4 +41,4 @@ jobs:
coverage xml
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
uses: codecov/codecov-action@v4
14 changes: 13 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [2.1.0]
### Added
- Added support for Python 3.11 - 3.13

### Removed
- Dropped support for Python 3.6 - 3.8

## [2.0.0] - 2023-10-13
- Moved to new GitHub organization

## [1.0.1] - 2021-09-28
### Fixed
- Fixed compare for `str` types.
Expand All @@ -15,6 +25,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Method to deep compare data structures containing `dict`, `list` and `tuple` types.
- Method to partially deep compare data structures containing `dict`, `list` and `tuple` types.

[Unreleased]: https://github.com/anexia/python-deepcompare/compare/1.0.1...HEAD
[Unreleased]: https://github.com/anexia/python-deepcompare/compare/2.1.0...HEAD
[2.1.0]: https://github.com/anexia/python-deepcompare/compare/2.0.0...2.1.0
[2.0.0]: https://github.com/anexia/python-deepcompare/releases/tag/2.0.0
[1.0.1]: https://github.com/anexia/python-deepcompare/compare/1.0.0...1.0.1
[1.0.0]: https://github.com/anexia/python-deepcompare/releases/tag/1.0.0
4 changes: 2 additions & 2 deletions deepcompare/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ def _compare(haystack: Any, subset: Any, partial: bool, strict: bool) -> bool:
if not issubclass(type(haystack), type(subset)):
return False

# if we compare compare two dict types, we check each key of the haystack object to be equal to the
# if we compare two dict types, we check each key of the haystack object to be equal to the
# subset object. if we are working in partial mode, we ignore if some keys are missing on the subset object.
# however we check if all keys of the subset object are existing on the haystack object.
if isinstance(haystack, _DICT_TYPES) and isinstance(subset, _DICT_TYPES):
return _compare_mapping(haystack, subset, partial, strict)

# if we compare compare two list types, we check each value of the haystack object to be equal to the
# if we compare two list types, we check each value of the haystack object to be equal to the
# subset object. if we are working in partial mode, we ignore if the subset list is shorter than the haystack list.
elif isinstance(haystack, _LIST_TYPES) and not isinstance(haystack, _STR_TYPES) \
and isinstance(subset, _LIST_TYPES) and not isinstance(subset, _STR_TYPES):
Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[build-system]
requires = [
"setuptools>=58",
"setuptools>=75",
"wheel",
]
build-backend = "setuptools.build_meta"

13 changes: 5 additions & 8 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@
-e .

# Development dependencies
pytest>=6.2,<6.3
flake8>=3.9,<3.10
pytest>=8.3,<8.4
flake8>=7.1,<7.2
codecov>=2.1,<2.2
setuptools>=42
wheel>=0.37
twine>=3.4

# fix importlib version to avoid "AttributeError: 'EntryPoints' object has no attribute 'get'" with flake8
importlib-metadata<5.0
setuptools>=75
wheel>=0.44
twine>=5.1
7 changes: 4 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
'Programming Language :: Python :: 3.13',
'Topic :: Software Development',
],
)