From 3e780a19fc676c2f15cd060332f6825c21d2cbf1 Mon Sep 17 00:00:00 2001 From: Matthias Bussonnier Date: Wed, 6 Jan 2021 09:59:57 -0800 Subject: [PATCH] Try to fix osx ci-build, drop Python 3.5 Not sure why it was not working anymore, migrate to conda. --- .github/workflows/ci-osx.yaml | 31 +++++++++++++++++++++---------- .github/workflows/wheel.yaml | 2 +- docs/release.rst | 5 +++++ setup.py | 6 +++--- 4 files changed, 30 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci-osx.yaml b/.github/workflows/ci-osx.yaml index d72f8643..38e1fcec 100644 --- a/.github/workflows/ci-osx.yaml +++ b/.github/workflows/ci-osx.yaml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.5", "3.6", "3.7", "3.8"] + python-version: ["3.6", "3.7", "3.8"] steps: - name: Checkout source @@ -17,17 +17,28 @@ jobs: submodules: recursive - name: Set up Python - uses: actions/setup-python@v1 + uses: conda-incubator/setup-miniconda@master with: - python-version: ${{ matrix.python-version }} - + channels: conda-forge + python-version: ${{ matrix.python-version }} + env: + ACTIONS_ALLOW_UNSECURE_COMMANDS: true - name: Install numcodecs + shell: "bash -l {0}" run: | - python -m pip install -U pip setuptools wheel pytest - python -m pip install -v -e . - - - name: List installed packages - run: python -m pip list + conda create -n env python==${{matrix.python-version}} wheel cython numpy msgpack-python pytest wheel pip compilers + conda activate env + which pip + conda env export + - name: Install numcodecs + shell: "bash -l {0}" + run: | + conda activate env + export CC=clang + python setup.py build - name: Run tests - run: pytest -v --pyargs numcodecs \ No newline at end of file + shell: "bash -l {0}" + run: | + conda activate env + pytest -v --pyargs numcodecs diff --git a/.github/workflows/wheel.yaml b/.github/workflows/wheel.yaml index 1c68d97f..2d5edaaf 100644 --- a/.github/workflows/wheel.yaml +++ b/.github/workflows/wheel.yaml @@ -13,7 +13,7 @@ jobs: env: CIBW_TEST_COMMAND: pytest --pyargs numcodecs CIBW_TEST_REQUIRES: pytest - CIBW_SKIP: "*27* pp*" + CIBW_SKIP: "*27* pp* *35*" CIBW_ENVIRONMENT: "DISABLE_NUMCODECS_AVX2=1" CIBW_ENVIRONMENT_MACOS: "MACOSX_DEPLOYMENT_TARGET=10.9 DISABLE_NUMCODECS_AVX2=1" diff --git a/docs/release.rst b/docs/release.rst index a17defc2..0be9996f 100644 --- a/docs/release.rst +++ b/docs/release.rst @@ -1,6 +1,11 @@ Release notes ============= +* Remove support for Python 3.5 which is end of life. While the code base might + still be compatible; the source dist and wheel are marked as Python 3.6+ and + pip will not install them. Continuous integration on Python 3.5 has been + disabled. + .. _release_0.7.2: 0.7.2 diff --git a/setup.py b/setup.py index 3cf27dbc..1e5d7f12 100644 --- a/setup.py +++ b/setup.py @@ -318,8 +318,9 @@ def run_setup(with_extensions): }, ext_modules=ext_modules, cmdclass=cmdclass, - package_dir={'': '.'}, - packages=['numcodecs', 'numcodecs.tests'], + package_dir={"": "."}, + python_requires=">=3.6, <4", + packages=["numcodecs", "numcodecs.tests"], classifiers=[ 'Development Status :: 4 - Beta', 'Intended Audience :: Developers', @@ -330,7 +331,6 @@ def run_setup(with_extensions): 'Topic :: Software Development :: Libraries :: Python Modules', 'Operating System :: Unix', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8',