From 1d1e7bd9c12f66f4236e0e1dc9a00de402afdf65 Mon Sep 17 00:00:00 2001 From: philippadoherty Date: Tue, 13 Feb 2024 10:23:59 -0500 Subject: [PATCH] change non x64 py version to 3.11, numpy 1.24 --- .github/workflows/build-and-test-MACS3-macos12.yml | 2 +- .github/workflows/build-and-test-MACS3-non-x64.yml | 3 ++- pyproject.toml | 2 +- requirements.txt | 2 +- setup.py | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-and-test-MACS3-macos12.yml b/.github/workflows/build-and-test-MACS3-macos12.yml index 06141382..cc4b5029 100644 --- a/.github/workflows/build-and-test-MACS3-macos12.yml +++ b/.github/workflows/build-and-test-MACS3-macos12.yml @@ -38,7 +38,7 @@ jobs: - name: Setup venv run: | # create venv - python3 -m venv macs3venv + python3.11 -m venv macs3venv - name: Install dependencies run: | # make sure pip is the lastest diff --git a/.github/workflows/build-and-test-MACS3-non-x64.yml b/.github/workflows/build-and-test-MACS3-non-x64.yml index ef9a0278..e3a02fb3 100644 --- a/.github/workflows/build-and-test-MACS3-non-x64.yml +++ b/.github/workflows/build-and-test-MACS3-non-x64.yml @@ -76,7 +76,8 @@ jobs: cd /home/macs3/ # let's create virtualenv - virtualenv --system-site-packages macsenv + # virtualenv --system-site-packages macsenv + virtualenv --python=python3.11 --system-site-packages macsenv source macsenv/bin/activate # copy source code over diff --git a/pyproject.toml b/pyproject.toml index 5eac1248..ec117689 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,2 +1,2 @@ [build-system] -requires=['setuptools>=60.0', 'numpy==1.25', 'cykhash>=2.0,<3.0', 'Cython~=3.0', 'hmmlearn>=0.3'] +requires=['setuptools>=60.0', 'numpy==1.24', 'cykhash>=2.0,<3.0', 'Cython~=3.0', 'hmmlearn>=0.3'] diff --git a/requirements.txt b/requirements.txt index 19b597bb..3417eb78 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ Cython~=3.0 -numpy==1.25 +numpy==1.24 hmmlearn>=0.3 cykhash>=2.0,<3.0 pytest>=7.0 diff --git a/setup.py b/setup.py index 318fbd61..84217a55 100644 --- a/setup.py +++ b/setup.py @@ -37,7 +37,7 @@ 'Programming Language :: Python :: 3.12', 'Programming Language :: Cython', ] -install_requires = [ "numpy==1.25", +install_requires = [ "numpy==1.24", "hmmlearn>=0.3", "cykhash>=2.0,<3.0", "Cython~=3.0" ]