Skip to content

Commit

Permalink
Drop Python 3.9
Browse files Browse the repository at this point in the history
Try removing Windows cbgen restriction

Fix quotes
  • Loading branch information
tomwhite committed Nov 4, 2024
1 parent d7779a3 commit c60631e
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: '3.9'
python-version: ["3.10"]
- name: Install dependencies
run: |
sudo apt update -y
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-gpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
shell: bash -l {0}
strategy:
matrix:
python-version: ["3.9", "3.10"]
python-version: ["3.10"]

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.9", "3.10", "3.11"]
python-version: ["3.10", "3.11"]

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: '3.10'
python-version: ["3.10"]
- name: Install dependencies
run: |
sudo apt update -y
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.9]
python-version: ["3.10"]

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:
matrix:
# don't use macos-latest as it uses M1 which doesn't work
os: [ubuntu-latest, macos-12]
python-version: ["3.9", "3.10", "3.11"]
python-version: ["3.10", "3.11"]
runs-on: ${{ matrix.os }}
steps:
# checkout repo to subdirectory to get access to scripts
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
needs: ['build']
strategy:
matrix:
python-version: ["3.9"]
python-version: ["3.10"]
steps:
# checkout repo to subdirectory to get access to scripts
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: windows-latest
strategy:
matrix:
python-version: ["3.9"]
python-version: ["3.10"]

steps:
- uses: actions/checkout@v2
Expand Down
6 changes: 2 additions & 4 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@ queue_rules:
- name: default
conditions:
- base=main
- status-success=build (3.9)
- status-success=build (3.10)
- status-success=build (3.11)
- status-success=win_build (3.9)
- status-success=win_build (3.10)
- approved-reviews-by=@sgkit-dev/committers
- "#approved-reviews-by>=1"
- label=auto-merge
Expand All @@ -14,10 +13,9 @@ pull_request_rules:
- name: automatic merge
conditions:
- base=main
- status-success=build (3.9)
- status-success=build (3.10)
- status-success=build (3.11)
- status-success=win_build (3.9)
- status-success=win_build (3.10)
- approved-reviews-by=@sgkit-dev/committers
- "#approved-reviews-by>=1"
- label=auto-merge
Expand Down
2 changes: 1 addition & 1 deletion docs/getting_started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Getting Started
Installation
------------

You can install sgkit with pip. Python 3.9, 3.10, or 3.11 is required::
You can install sgkit with pip. Python 3.10, 3.11, or 3.12 is required::

$ pip install sgkit

Expand Down
3 changes: 1 addition & 2 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ scikit-learn
partd
bed-reader
rechunker
cbgen < 1.0.5; platform_system != "Windows"
cbgen == 1.0.1; platform_system == "Windows"
cbgen < 1.0.5
bio2zarr; platform_system != "Windows"
yarl
matplotlib
Expand Down
3 changes: 1 addition & 2 deletions requirements-numpy2-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ scikit-learn
partd
bed-reader
rechunker
cbgen > 1.0.5; platform_system != "Windows"
cbgen == 1.0.1; platform_system == "Windows"
cbgen > 1.0.5
yarl
matplotlib
asv
Expand Down
6 changes: 2 additions & 4 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ classifiers =
Intended Audience :: Science/Research
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Programming Language :: Python :: 3.12
Expand All @@ -26,7 +25,7 @@ classifiers =
packages = sgkit
zip_safe = False # https://mypy.readthedocs.io/en/latest/installed_packages.html
include_package_data = True
python_requires = >=3.9
python_requires = >=3.10
install_requires =
numpy < 2
xarray
Expand Down Expand Up @@ -62,8 +61,7 @@ plink =
bed-reader
bgen =
rechunker
cbgen < 1.0.5; platform_system != "Windows"
cbgen == 1.0.1; platform_system == "Windows"
cbgen < 1.0.5

[coverage:report]
fail_under = 100
Expand Down

0 comments on commit c60631e

Please sign in to comment.