Skip to content

Commit 05bc498

Browse files
authored
Merge pull request #87 from Geode-solutions/fix/actions
Fix/actions
2 parents 732828a + 1f3105d commit 05bc498

File tree

9 files changed

+56
-33
lines changed

9 files changed

+56
-33
lines changed

.github/workflows/Branch-protection.yml

Lines changed: 0 additions & 11 deletions
This file was deleted.

.github/workflows/pr_update.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: Pull request
2+
3+
on:
4+
pull_request:
5+
types: [opened, reopened]
6+
branches:
7+
- master
8+
9+
jobs:
10+
update-branch:
11+
uses: Geode-solutions/actions/.github/workflows/update-branch.yml@master

.github/workflows/prepare_pr.yml

Lines changed: 0 additions & 11 deletions
This file was deleted.

.github/workflows/test.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Test
2+
3+
on:
4+
push:
5+
branches-ignore:
6+
- master
7+
- next
8+
9+
jobs:
10+
test:
11+
uses: Geode-solutions/actions/.github/workflows/py-test.yml@master
12+
with:
13+
repos: ${{ vars.REPOS }}
14+
secrets: inherit

.github/workflows/test_pr.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: Test PR
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize, reopened, ready_for_review]
6+
7+
jobs:
8+
test:
9+
uses: Geode-solutions/actions/.github/workflows/py-test-pr.yml@master
10+
with:
11+
repos: ${{ vars.REPOS }}
12+
secrets: inherit

.releaserc

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
branches: [
3+
{ name: "master" },
4+
{ name: "next", channel: "next", prerelease: "rc" }
5+
],
6+
plugins: [
7+
'@semantic-release/commit-analyzer',
8+
'@semantic-release/release-notes-generator',
9+
'@semantic-release/github'
10+
]
11+
}

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ classifiers = [
2121

2222
[project.optional-dependencies]
2323
gpu = ["vtk == 9.3.1"]
24+
cpu = ["vtk-osmesa == 9.3.1"]
2425

2526
[project.urls]
2627
"Homepage" = "https://github.com/Geode-solutions/OpenGeodeWeb-Viewer"

requirements.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
wslink<2
2-
fastjsonschema
3-
websocket-client
1+
wslink==1.12.4
2+
fastjsonschema==2.21.1
3+
websocket_client==1.8.0

requirements.txt

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.10
2+
# This file is autogenerated by pip-compile with Python 3.12
33
# by the following command:
44
#
5-
# pip-compile requirements.in
5+
# pip-compile --pre requirements.in
66
#
77
aiohappyeyeballs==2.6.1
88
# via aiohttp
9-
aiohttp==3.12.14
9+
aiohttp==3.12.15
1010
# via wslink
1111
aiosignal==1.4.0
1212
# via aiohttp
13-
async-timeout==5.0.1
14-
# via aiohttp
1513
attrs==25.3.0
1614
# via aiohttp
1715
fastjsonschema==2.21.1
@@ -31,9 +29,7 @@ propcache==0.3.2
3129
# aiohttp
3230
# yarl
3331
typing-extensions==4.14.1
34-
# via
35-
# aiosignal
36-
# multidict
32+
# via aiosignal
3733
websocket-client==1.8.0
3834
# via -r requirements.in
3935
wslink==1.12.4

0 commit comments

Comments
 (0)