Skip to content

Commit 0b2b18a

Browse files
authored
Merge branch 'develop' into minicondacheck
2 parents 4a3a119 + c26690d commit 0b2b18a

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,12 @@ jobs:
6767
- "pypy-3.10"
6868
os: ["ubuntu-latest"]
6969
include:
70-
- os: "macos-latest"
71-
python-version: 3.8
70+
- os: "macos-13"
71+
python-version: "3.8"
72+
- os: "macos-14"
73+
python-version: "3.10"
7274
- os: "windows-latest"
73-
python-version: 3.8
75+
python-version: "3.8"
7476
steps:
7577
- uses: actions/[email protected]
7678
with:
@@ -168,7 +170,8 @@ jobs:
168170
matrix:
169171
os:
170172
- ubuntu-latest
171-
- macos-latest
173+
- macos-13
174+
- macos-14
172175
- windows-latest
173176
cibw_archs_linux: ["x86_64"]
174177
cibw_before_all_linux:

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,6 @@ Installation is supported on Linux, Windows and MacOS. For more advanced
101101
installation options check the `documentation
102102
<https://python-isal.readthedocs.io/en/stable/index.html#installation>`_.
103103

104-
.. _differences-with-zlib-and-gzip-modules:
105-
106104
python-isal as a dependency in your project
107105
-------------------------------------------
108106

@@ -125,6 +123,8 @@ your project please list a python-isal dependency as follows.
125123

126124
.. dependency end
127125
126+
.. _differences-with-zlib-and-gzip-modules:
127+
128128
Differences with zlib and gzip modules
129129
--------------------------------------
130130

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ def build_isa_l():
130130

131131
setup(
132132
name="isal",
133-
version="1.6.1",
133+
version="1.7.0-dev",
134134
description="Faster zlib and gzip compatible compression and "
135135
"decompression by providing python bindings for the ISA-L "
136136
"library.",

src/isal/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
"__version__"
1717
]
1818

19-
__version__ = "1.6.1"
19+
__version__ = "1.7.0-dev"

0 commit comments

Comments
 (0)