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

Jump to bottom

Experimentally try 3.12 and macos-latest-xlarge. #82

Merged
merged 1 commit into from
Jan 13, 2024
Merged

Experimentally try 3.12 and macos-latest-xlarge. #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions .github/workflows/build-macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ jobs:
runs-on: macos-12
strategy:
matrix:
python-version: ["3.7", "3.8"]
# python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
name: ${{ matrix.python-version }}
steps:
- name: Checkout repo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
shell: cmd
strategy:
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
name: ${{ matrix.python-version }}
steps:
- name: Checkout repo
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@ jobs:
- 3.9
- "3.10"
- 3.11
- 3.12
- pypy-3.7
os:
- ubuntu-latest
# - macos-10.15
# - macos-11
- macos-12
- macos-latest
- windows-latest
Expand Down Expand Up @@ -107,12 +106,12 @@ jobs:
if: runner.os == 'Windows'
working-directory: .\lzo-2.10\build
run: msbuild lzo_static_lib.vcxproj -p:Configuration=Release -p:Platform=x64 -p:OutDir=..\
- run: python setup.py install
- run: pip install pytest wheel
- run: pip install -e ./
- run: pip install pytest build
- run: pytest --doctest-modules tests/
- run: ls -l
if: runner.os != 'Windows'
- run: python setup.py sdist bdist_wheel
- run: python -m build
- name: Upload artifact
uses: actions/upload-artifact@v3
with:
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ jobs:
exclude:
- os: windows-2019
arch: "x86_64"
- os: ubuntu-20.04
arch: "arm64"
Comment on lines -34 to -35
Copy link
Contributor

Choose a reason for hiding this comment

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

This is excluded because this combination doesn't exist, the correct one is ubuntu-20.04/aarch64 and is already included above.

steps:
- name: Checkout repo
uses: actions/checkout@v3
Expand All @@ -51,7 +49,7 @@ jobs:
name: ${{ runner.os }}-${{ matrix.arch }}
path: wheelhouse/*.whl
if-no-files-found: error

wheels-old:
name: Build old wheels on ${{ matrix.os }} for ${{ matrix.arch }}
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -99,7 +97,7 @@ jobs:
name: ${{ runner.os }}-${{ matrix.arch }}
path: wheelhouse/*.whl
if-no-files-found: error

wheels-win27:
name: Build Python 2.7 wheels on Windows ${{ matrix.arch }}
runs-on: windows-2019
Expand Down Expand Up @@ -189,4 +187,4 @@ jobs:
uses: pypa/gh-action-pypi-publish@release/v1
with:
print-hash: true
repository-url: https://test.pypi.org/legacy/
repository-url: https://test.pypi.org/legacy/
5 changes: 4 additions & 1 deletion NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
User visible changes for Python-LZO
=======================================================================

Changes in 1.15 (XX Jan 2022)
Changes in 1.16 (XX Jan 2024)
*

Changes in 1.15 (22 May 2022)
* Remove python 2.x support.
* Update to PEP517 compliance.
* Migrate CI to github actions.
Expand Down
2 changes: 1 addition & 1 deletion lzomodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
*/


#define MODULE_VERSION "1.15"
#define MODULE_VERSION "1.16"

#define PY_SSIZE_T_CLEAN

Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "python-lzo"
version = "1.15"
version = "1.16"
description = "Python bindings for the LZO data compression library"
readme = "README.md"
requires-python = ">=2.6"
Expand Down Expand Up @@ -38,4 +38,4 @@ archs = ["all"]
build-verbosity = 3
test-requires = "pytest"
test-command = "pytest {package}/tests"
test-skip = "*-win_arm64 *-macosx_arm64 *-macosx_universal2:arm64"
test-skip = "*-win_arm64 *-macosx_arm64 *-macosx_universal2:arm64"
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def run(self):

setup(
name="python-lzo",
version="1.15",
version="1.16",
description="Python bindings for the LZO data compression library",
author="Markus F.X.J. Oberhumer",
author_email="[email protected]",
Expand Down