From 001a58589c568222978db62e8ea67871262b4925 Mon Sep 17 00:00:00 2001 From: Ali Khan Date: Wed, 3 Apr 2024 12:45:39 -0400 Subject: [PATCH] leave python 3.12 out, was failing tests --- .github/workflows/main.yml | 47 -------------------------------------- .github/workflows/test.yml | 2 +- poetry.lock | 7 +++--- pyproject.toml | 2 +- 4 files changed, 5 insertions(+), 53 deletions(-) delete mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index a272261..0000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: Tests - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - tests: - runs-on: ubuntu-latest - strategy: - max-parallel: 5 - - steps: - - uses: actions/checkout@v2 - - name: Set up Python 3.11 - uses: actions/setup-python@v2 - with: - python-version: 3.11 - - name: Add conda to system path - run: | - # $CONDA is an environment variable pointing to the root of the miniconda directory - echo $CONDA/bin >> $GITHUB_PATH - - name: Install dependencies - run: | - conda install -c conda-forge mamba - # - name: Lint with flake8 - # run: | - # mamba install flake8 - # # stop the build if there are Python syntax errors or undefined names - # flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics - # # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide - # flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics - - name: Setup snakemake and workflow dependencies - run: | - mamba install -c conda-forge -c bioconda pytest snakemake singularity snakefmt - pip install . - - name: Lint with snakemake and snakefmt - run: | - snakemake --lint - snakefmt workflow - - name: Integration dry-run test - run: | - snakemake -np - - diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7f57777..9303d03 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,7 +24,7 @@ jobs: needs: [quality] strategy: matrix: - python-version: ['3.11', '3.12'] + python-version: ['3.11'] steps: - name: Setup Python environments uses: khanlab/actions/.github/actions/action-setup_task-installPyProject@v0.3.6 diff --git a/poetry.lock b/poetry.lock index fef566e..6a9d7f3 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1042,7 +1042,7 @@ files = [ ] [package.dependencies] -numpy = {version = ">=1.26.0,<2", markers = "python_version >= \"3.12\""} +numpy = {version = ">=1.23.2,<2", markers = "python_version == \"3.11\""} python-dateutil = ">=2.8.2" pytz = ">=2020.1" tzdata = ">=2022.7" @@ -1978,7 +1978,6 @@ jinja2-time = ">=0.2.0" lazy-loader = ">=0.3" more-itertools = ">=8" numpy = {version = ">=1.23.2", markers = "python_version >= \"3.11\""} -pandas = {version = ">=2.1.1", markers = "python_version >= \"3.12\""} pvandyken-deprecated = "0.0.4" pybids = ">=0.16.0,<0.17" requests = ">=2.31.0" @@ -2399,5 +2398,5 @@ pyyaml = ">=6.0,<7.0" [metadata] lock-version = "2.0" -python-versions = ">=3.11,<3.13" -content-hash = "24f62f8bc5131f965924128bec7533b22e50fdd72895677f1b9a9c6b4ef5b883" +python-versions = ">=3.11,<3.12" +content-hash = "788c23de2284f43514676c3ddec433aad3a9d41f8ed5e14082b832f3452d2ccc" diff --git a/pyproject.toml b/pyproject.toml index 85bfcac..7e9a78b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ readme = "README.md" packages = [] [tool.poetry.dependencies] -python = ">=3.11,<3.13" +python = ">=3.11,<3.12" snakemake = "<8.0.0" pulp = "2.7.0" snakebids = "0.11.0"