Skip to content

Commit

Permalink
Merge branch 'master' into phanak-sap-patch-4
Browse files Browse the repository at this point in the history
  • Loading branch information
phanak-sap authored Sep 20, 2024
2 parents f03b549 + b6223d1 commit 2957e10
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 16 deletions.
12 changes: 2 additions & 10 deletions .github/workflows/python-tests-compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,11 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
lxml-version: ["4.1.1", "4.2.6", "4.3.5", "4.4.3", "4.5.2", "4.6.5", "4.7.1", "4.8.0", "4.9.1", "4.9.4", "5.0.1", "5.1.0"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
lxml-version: ["4.2.6", "4.3.5", "4.4.3", "4.5.2", "4.6.5", "4.7.1", "4.8.0", "4.9.1", "4.9.4", "5.0.1", "5.1.0"]
exclude:
- python-version: 3.9
lxml-version: 4.1.1
- python-version: 3.9
lxml-version: 4.2.6
- python-version: 3.10
lxml-version: 4.1.1
- python-version: 3.10
lxml-version: 4.2.6
- python-version: 3.10
Expand All @@ -35,8 +31,6 @@ jobs:
lxml-version: 4.4.3
- python-version: 3.10
lxml-version: 4.5.2
- python-version: 3.11
lxml-version: 4.1.1
- python-version: 3.11
lxml-version: 4.2.6
- python-version: 3.11
Expand All @@ -51,8 +45,6 @@ jobs:
lxml-version: 4.7.1
- python-version: 3.11
lxml-version: 4.8.0
- python-version: 3.12
lxml-version: 4.1.1
- python-version: 3.12
lxml-version: 4.2.6
- python-version: 3.12
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
## [Unreleased]


### Removed
- Python 3.7 (long after its EOL) is no longer supported by pyodata. Python 3.8 is now minimal supported version. - Petr Hanak

## [1.11.1]

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
already a test going through the statements you have modified, you are probably
wrong because you either added something new and it should be tested or you fixed
a bug which was not detected by the test and hence the test must be enhanced
(ideally, you fist fix the test to reproduce the bug and then you fix the bug).
(ideally, you first fix the test to reproduce the bug and then you fix the bug).

* Link commits to issues via referencing issue numbers: https://help.github.com/en/articles/closing-issues-using-keywords

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ details.

## Requirements

- [Python >= 3.7](https://www.python.org/downloads/)
- [Python >= 3.8](https://www.python.org/downloads/)

## Download and Installation

Expand Down
2 changes: 1 addition & 1 deletion dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ pylint==2.17.7
pytest-cov>=3.0.0
flake8==5.0.4
bandit==1.7.5
sphinx==7.3.7
sphinx==7.3.7
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lxml>=4.1.1
lxml>=4.2.6
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def _read(name):
packages=find_packages(exclude=("tests")),
zip_safe=False,
install_requires=[
"lxml>=4.1.1",
"lxml>=4.2.6",
],
extras_require={
},
Expand All @@ -59,7 +59,6 @@ def _read(name):
'Intended Audience :: Developers',
'License :: OSI Approved :: Apache Software License',
'Operating System :: OS Independent',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
Expand Down

0 comments on commit 2957e10

Please sign in to comment.