Skip to content

Commit d01748a

Browse files
authored
Merge pull request #127 from AllenCellModeling/fix/build-deprecations
fix a few build warnings or errors
2 parents f49d8e7 + 0e5ab93 commit d01748a

File tree

8 files changed

+11
-16
lines changed

8 files changed

+11
-16
lines changed

.github/workflows/build-docs-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Setup Python
1313
uses: actions/setup-python@v5
1414
with:
15-
python-version: "3.10"
15+
python-version: "3.12"
1616
- name: Install Dependencies
1717
run: |
1818
pip install --upgrade pip setuptools

.github/workflows/build-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Setup Python
1616
uses: actions/setup-python@v5
1717
with:
18-
python-version: "3.10"
18+
python-version: "3.12"
1919
- name: Install Dependencies
2020
run: |
2121
pip install --upgrade pip setuptools

.github/workflows/py-build-main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ${{ matrix.os }}
1919
strategy:
2020
matrix:
21-
python-version: [3.8, 3.9, "3.10", 3.11, 3.12]
21+
python-version: [3.9, "3.10", 3.11, 3.12, 3.13]
2222
os: [ubuntu-latest, windows-latest, macos-latest]
2323
steps:
2424
- uses: actions/checkout@v4
@@ -46,7 +46,7 @@ jobs:
4646
- name: Set up Python
4747
uses: actions/setup-python@v5
4848
with:
49-
python-version: "3.10"
49+
python-version: "3.12"
5050
- name: Install dependencies
5151
run: |
5252
python -m pip install --upgrade pip setuptools
@@ -99,7 +99,7 @@ jobs:
9999
with:
100100
submodules: true
101101

102-
- uses: pypa/cibuildwheel@v2.19.2
102+
- uses: pypa/cibuildwheel@v2.23.2
103103
env:
104104
CIBW_BUILD: "*-${{ matrix.cibw-arch }}"
105105
CIBW_BEFORE_ALL_LINUX: yum install -y zlib-devel libpng-devel

.github/workflows/py-build-pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
strategy:
77
max-parallel: 6
88
matrix:
9-
python-version: [3.8, 3.9, "3.10", 3.11, 3.12]
9+
python-version: [3.9, "3.10", 3.11, 3.12, 3.13]
1010
os: [ubuntu-latest, windows-latest, macos-latest]
1111

1212
steps:
@@ -42,7 +42,7 @@ jobs:
4242
- name: Set up Python
4343
uses: actions/setup-python@v5
4444
with:
45-
python-version: "3.10"
45+
python-version: "3.12"
4646
- name: Install dependencies
4747
run: |
4848
python -m pip install --upgrade pip setuptools

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.8.12)
1+
cmake_minimum_required(VERSION 3.10)
22

33
set(CMAKE_MACOSX_RPATH 1)
44

docs/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.8.12)
1+
cmake_minimum_required(VERSION 3.10)
22

33
LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
44

setup.cfg

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ replace = {new_version}
2222
search = {current_version}
2323
replace = {new_version}
2424

25-
[bdist_wheel]
26-
universal = 1
27-
2825
[flake8]
2926
exclude = docs
3027
max-line-length = 120

setup.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,8 @@ def build_extension(self, ext):
114114
long_description_content_type="text/markdown",
115115
include_package_data=True,
116116
keywords="aicspylibczi, allen cell, imaging, computational biology",
117-
license="GPLv3",
118-
classifiers=[
119-
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
120-
],
117+
license="GPL-3.0-or-later",
118+
classifiers=[],
121119
ext_modules=[CMakeExtension('_aicspylibczi')],
122120
packages=['aicspylibczi'],
123121
cmdclass=dict(build_ext=CMakeBuild),

0 commit comments

Comments
 (0)