diff --git a/.github/workflows/Branch-protection.yml b/.github/workflows/Branch-protection.yml deleted file mode 100644 index c18d3a6..0000000 --- a/.github/workflows/Branch-protection.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: Check branch origin - -on: - pull_request: - -jobs: - check-branch-protection: - uses: Geode-solutions/actions/.github/workflows/branch-protection.yml@master - with: - branch_from: 'next' - branch_to: 'master' diff --git a/.github/workflows/pr_update.yml b/.github/workflows/pr_update.yml new file mode 100644 index 0000000..9743601 --- /dev/null +++ b/.github/workflows/pr_update.yml @@ -0,0 +1,11 @@ +name: Pull request + +on: + pull_request: + types: [opened, reopened] + branches: + - master + +jobs: + update-branch: + uses: Geode-solutions/actions/.github/workflows/update-branch.yml@master \ No newline at end of file diff --git a/.github/workflows/prepare_pr.yml b/.github/workflows/prepare_pr.yml deleted file mode 100644 index 77f8181..0000000 --- a/.github/workflows/prepare_pr.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: Prepare PR - -on: - pull_request: - branches: - - next - -jobs: - prepare: - uses: Geode-solutions/actions/.github/workflows/py-prepare-pr.yml@master - secrets: inherit diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..e819317 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,14 @@ +name: Test + +on: + push: + branches-ignore: + - master + - next + +jobs: + test: + uses: Geode-solutions/actions/.github/workflows/py-test.yml@master + with: + repos: ${{ vars.REPOS }} + secrets: inherit diff --git a/.github/workflows/test_pr.yml b/.github/workflows/test_pr.yml new file mode 100644 index 0000000..177cb91 --- /dev/null +++ b/.github/workflows/test_pr.yml @@ -0,0 +1,12 @@ +name: Test PR + +on: + pull_request: + types: [opened, synchronize, reopened, ready_for_review] + +jobs: + test: + uses: Geode-solutions/actions/.github/workflows/py-test-pr.yml@master + with: + repos: ${{ vars.REPOS }} + secrets: inherit diff --git a/.releaserc b/.releaserc new file mode 100644 index 0000000..bf47fdf --- /dev/null +++ b/.releaserc @@ -0,0 +1,11 @@ +{ + branches: [ + { name: "master" }, + { name: "next", channel: "next", prerelease: "rc" } + ], + plugins: [ + '@semantic-release/commit-analyzer', + '@semantic-release/release-notes-generator', + '@semantic-release/github' + ] +} diff --git a/pyproject.toml b/pyproject.toml index 71bf10c..3ca2678 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,6 +21,7 @@ classifiers = [ [project.optional-dependencies] gpu = ["vtk == 9.3.1"] +cpu = ["vtk-osmesa == 9.3.1"] [project.urls] "Homepage" = "https://github.com/Geode-solutions/OpenGeodeWeb-Viewer" diff --git a/requirements.in b/requirements.in index 82f4c74..17189c4 100644 --- a/requirements.in +++ b/requirements.in @@ -1,3 +1,3 @@ -wslink<2 -fastjsonschema -websocket-client \ No newline at end of file +wslink==1.12.4 +fastjsonschema==2.21.1 +websocket_client==1.8.0 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index c4d360d..36123ac 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,17 +1,15 @@ # -# This file is autogenerated by pip-compile with Python 3.10 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile requirements.in +# pip-compile --pre requirements.in # aiohappyeyeballs==2.6.1 # via aiohttp -aiohttp==3.12.14 +aiohttp==3.12.15 # via wslink aiosignal==1.4.0 # via aiohttp -async-timeout==5.0.1 - # via aiohttp attrs==25.3.0 # via aiohttp fastjsonschema==2.21.1 @@ -31,9 +29,7 @@ propcache==0.3.2 # aiohttp # yarl typing-extensions==4.14.1 - # via - # aiosignal - # multidict + # via aiosignal websocket-client==1.8.0 # via -r requirements.in wslink==1.12.4