Skip to content

Commit 3e780a1

Browse files
committed
Try to fix osx ci-build, drop Python 3.5
Not sure why it was not working anymore, migrate to conda.
1 parent 2c1aff9 commit 3e780a1

File tree

4 files changed

+30
-14
lines changed

4 files changed

+30
-14
lines changed

.github/workflows/ci-osx.yaml

+21-10
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
fail-fast: false
1010
matrix:
11-
python-version: ["3.5", "3.6", "3.7", "3.8"]
11+
python-version: ["3.6", "3.7", "3.8"]
1212

1313
steps:
1414
- name: Checkout source
@@ -17,17 +17,28 @@ jobs:
1717
submodules: recursive
1818

1919
- name: Set up Python
20-
uses: actions/setup-python@v1
20+
uses: conda-incubator/setup-miniconda@master
2121
with:
22-
python-version: ${{ matrix.python-version }}
23-
22+
channels: conda-forge
23+
python-version: ${{ matrix.python-version }}
24+
env:
25+
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
2426
- name: Install numcodecs
27+
shell: "bash -l {0}"
2528
run: |
26-
python -m pip install -U pip setuptools wheel pytest
27-
python -m pip install -v -e .
28-
29-
- name: List installed packages
30-
run: python -m pip list
29+
conda create -n env python==${{matrix.python-version}} wheel cython numpy msgpack-python pytest wheel pip compilers
30+
conda activate env
31+
which pip
32+
conda env export
33+
- name: Install numcodecs
34+
shell: "bash -l {0}"
35+
run: |
36+
conda activate env
37+
export CC=clang
38+
python setup.py build
3139
3240
- name: Run tests
33-
run: pytest -v --pyargs numcodecs
41+
shell: "bash -l {0}"
42+
run: |
43+
conda activate env
44+
pytest -v --pyargs numcodecs

.github/workflows/wheel.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
env:
1414
CIBW_TEST_COMMAND: pytest --pyargs numcodecs
1515
CIBW_TEST_REQUIRES: pytest
16-
CIBW_SKIP: "*27* pp*"
16+
CIBW_SKIP: "*27* pp* *35*"
1717
CIBW_ENVIRONMENT: "DISABLE_NUMCODECS_AVX2=1"
1818
CIBW_ENVIRONMENT_MACOS: "MACOSX_DEPLOYMENT_TARGET=10.9 DISABLE_NUMCODECS_AVX2=1"
1919

docs/release.rst

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
Release notes
22
=============
33

4+
* Remove support for Python 3.5 which is end of life. While the code base might
5+
still be compatible; the source dist and wheel are marked as Python 3.6+ and
6+
pip will not install them. Continuous integration on Python 3.5 has been
7+
disabled.
8+
49
.. _release_0.7.2:
510

611
0.7.2

setup.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,9 @@ def run_setup(with_extensions):
318318
},
319319
ext_modules=ext_modules,
320320
cmdclass=cmdclass,
321-
package_dir={'': '.'},
322-
packages=['numcodecs', 'numcodecs.tests'],
321+
package_dir={"": "."},
322+
python_requires=">=3.6, <4",
323+
packages=["numcodecs", "numcodecs.tests"],
323324
classifiers=[
324325
'Development Status :: 4 - Beta',
325326
'Intended Audience :: Developers',
@@ -330,7 +331,6 @@ def run_setup(with_extensions):
330331
'Topic :: Software Development :: Libraries :: Python Modules',
331332
'Operating System :: Unix',
332333
'Programming Language :: Python :: 3',
333-
'Programming Language :: Python :: 3.5',
334334
'Programming Language :: Python :: 3.6',
335335
'Programming Language :: Python :: 3.7',
336336
'Programming Language :: Python :: 3.8',

0 commit comments

Comments
 (0)