Skip to content

Commit de1c0fa

Browse files
authored
Merge pull request #12 from thewtex/build-configuration-updates
build configuration updates
2 parents 06ff423 + 8292b83 commit de1c0fa

File tree

5 files changed

+3908
-20
lines changed

5 files changed

+3908
-20
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# SCM syntax highlighting & preventing 3-way merges
2+
pixi.lock merge=binary linguist-language=YAML linguist-generated=true

.github/workflows/test_and_deploy.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,20 @@ jobs:
1818
strategy:
1919
matrix:
2020
platform: [ubuntu-latest, windows-latest, macos-latest]
21-
python-version: [3.7, 3.8, 3.9]
21+
python-version: ['3.10', '3.11', '3.12', '3.13']
2222

2323
steps:
24-
- uses: actions/checkout@v2
24+
- uses: actions/checkout@v4
2525

2626
- name: Set up Python ${{ matrix.python-version }}
27-
uses: actions/setup-python@v2
27+
uses: actions/setup-python@v5
2828
with:
2929
python-version: ${{ matrix.python-version }}
3030

3131
- name: Install dependencies
3232
run: |
3333
python -m pip install --upgrade pip
34-
pip install flit
35-
flit install --deps develop
34+
pip install -e ".[test]"
3635
3736
# these libraries, along with pytest-xvfb (added in the `deps` in tox.ini),
3837
# enable testing on Qt on linux
@@ -48,7 +47,7 @@ jobs:
4847
- name: Install Windows OpenGL
4948
if: runner.os == 'Windows'
5049
run: |
51-
git clone --depth 1 git://github.com/pyvista/gl-ci-helpers.git
50+
git clone --depth 1 https://github.com/pyvista/gl-ci-helpers.git
5251
powershell gl-ci-helpers/appveyor/install_opengl.ps1
5352
5453
- name: Test

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
dist
2+
# pixi environments
3+
.pixi/*
4+
!.pixi/config.toml

0 commit comments

Comments
 (0)