Skip to content

Fix/GitHub actions #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions .github/workflows/CICD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: CICD

on:
push:
branches: [master, next]

jobs:
test:
Expand All @@ -13,19 +12,13 @@ jobs:
- name: Test
run: |
pip install pytest pytest-xprocess
pip install -r requirements.txt
pip install .
echo "toto"
ls /usr/local/lib/python3.9/site-packages/opengeodeweb_viewer
echo "tutu"
ls /usr/local/lib/python3.9/site-packages/opengeodeweb_viewer/tests
echo "titi"
ls /usr/local/lib/python3.9/site-packages/opengeodeweb_viewer/tests/data
pip install -e .
pytest

build:
runs-on: ubuntu-latest
needs: test
if: github.ref == 'refs/heads/next' || github.ref == 'refs/heads/master'
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
5 changes: 3 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ classifiers = [
"Operating System :: OS Independent",
]

[project.optional-dependencies]
gpu = ["vtk == 9.*"]

[project.urls]
"Homepage" = "https://github.com/Geode-solutions/OpenGeodeWeb-Viewer"
"Bug Tracker" = "https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/issues"
Expand All @@ -34,8 +37,6 @@ where = ["src"]

[tool.setuptools.package-data]
"opengeodeweb_viewer.rpc.schemas" = ["*.json"]
"tests.images" = ["*.*"]
"tests.data" = ["*.*"]

[tool.semantic_release]
version_toml = [
Expand Down
1 change: 0 additions & 1 deletion requirements.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
jsonschema
python-dotenv
vtk
wslink
websocket-client
30 changes: 0 additions & 30 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,44 +15,20 @@ attrs==23.2.0
# aiohttp
# jsonschema
# referencing
contourpy==1.2.0
# via matplotlib
cycler==0.12.1
# via matplotlib
fonttools==4.49.0
# via matplotlib
frozenlist==1.4.1
# via
# aiohttp
# aiosignal
idna==3.6
# via yarl
importlib-resources==6.1.3
# via matplotlib
jsonschema==4.21.1
# via -r requirements.in
jsonschema-specifications==2023.12.1
# via jsonschema
kiwisolver==1.4.5
# via matplotlib
matplotlib==3.8.3
# via vtk
multidict==6.0.5
# via
# aiohttp
# yarl
numpy==1.26.4
# via
# contourpy
# matplotlib
packaging==24.0
# via matplotlib
pillow==10.2.0
# via matplotlib
pyparsing==3.1.2
# via matplotlib
python-dateutil==2.9.0.post0
# via matplotlib
python-dotenv==1.0.1
# via -r requirements.in
referencing==0.33.0
Expand All @@ -63,15 +39,9 @@ rpds-py==0.18.0
# via
# jsonschema
# referencing
six==1.16.0
# via python-dateutil
vtk==9.3.0
# via -r requirements.in
websocket-client==1.7.0
# via -r requirements.in
wslink==1.12.4
# via -r requirements.in
yarl==1.9.4
# via aiohttp
zipp==3.17.0
# via importlib-resources
3 changes: 2 additions & 1 deletion src/opengeodeweb_viewer/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ def dev_config():

def test_config():
default_config()
print(f"{os.path.dirname(__file__)=}", flush=True)
os.environ["DATA_FOLDER_PATH"] = os.path.join(
os.path.dirname(__file__), "tests", "data"
os.path.dirname(__file__), "..", "tests", "data"
)