Skip to content

Commit f5ce95a

Browse files
authored
Merge branch 'main' into type-hints
2 parents 4d15932 + 36557a8 commit f5ce95a

File tree

5 files changed

+3445
-704
lines changed

5 files changed

+3445
-704
lines changed

.github/workflows/python-package.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ name: Python package
44

55
on:
66
push:
7-
branches: [ master ]
7+
branches: [ main ]
88
pull_request:
9-
branches: [ master ]
9+
branches: [ main ]
1010

1111

1212
jobs:
@@ -16,12 +16,12 @@ jobs:
1616
strategy:
1717
# You can use PyPy versions in python-version. For example, pypy2 and pypy3
1818
matrix:
19-
python-version: [3.7, 3.8, 3.9]
19+
python-version: ["3.10"]
2020

2121
steps:
22-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v4
2323
- name: Set up Python ${{ matrix.python-version }}
24-
uses: actions/setup-python@v2
24+
uses: actions/setup-python@v4
2525
with:
2626
python-version: ${{ matrix.python-version }}
2727
# You can test your matrix by printing the current Python version

.github/workflows/testing.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
name: Run Tests
22

33
on:
4-
- push
5-
- pull_request
4+
push:
5+
branches: [main]
6+
pull_request:
7+
branches: [main]
68

79
jobs:
810
build:
@@ -11,22 +13,22 @@ jobs:
1113
strategy:
1214
fail-fast: false
1315
matrix:
14-
os: [ubuntu-latest, macos-11, windows-latest]
15-
python-version: ["3.7", "3.8", "3.9", "3.10"] #3.9 only failing for tables on macos and windows; mwm 6302021
16+
os: [ubuntu-latest, macos-latest, windows-latest]
17+
python-version: ["3.12", "3.13"]
1618
include:
1719
- os: ubuntu-latest
1820
path: ~/.cache/pip
19-
- os: macos-11
21+
- os: macos-latest
2022
path: ~/Library/Caches/pip
2123
- os: windows-latest
2224
path: ~\AppData\Local\pip\Cache
2325

2426
steps:
2527
- name: Checkout code
26-
uses: actions/checkout@v2
28+
uses: actions/checkout@v4
2729

2830
- name: Set up Python ${{ matrix.python-version }}
29-
uses: actions/setup-python@v3
31+
uses: actions/setup-python@v4
3032
with:
3133
python-version: ${{ matrix.python-version }}
3234
- name: Install ffmpeg
@@ -40,6 +42,10 @@ jobs:
4042
choco install ffmpeg
4143
fi
4244
shell: bash
45+
- name: Install PyTables through Conda
46+
shell: bash -el {0} # Important: activates the conda environment
47+
run: |
48+
conda install pytables==3.8.0 "numpy<2"
4349
- name: Install and test
4450
run: |
4551
python -m pip install --upgrade pip wheel poetry

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,10 @@ venv.bak/
124124
.spyderproject
125125
.spyproject
126126

127+
# IDEs configurations
128+
.vscode/*
129+
.idea/*
130+
127131
# Rope project settings
128132
.ropeproject
129133

0 commit comments

Comments
 (0)