Skip to content
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

Add CI #2

Merged
merged 9 commits into from
Jun 12, 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
48 changes: 16 additions & 32 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
build:
name: Build jupytercad
name: Build jupytergis
runs-on: ubuntu-latest

steps:
Expand All @@ -18,7 +18,7 @@ jobs:
- name: Install Conda environment with Micromamba
uses: mamba-org/setup-micromamba@v1
with:
environment-name: cad
environment-name: gis
create-args: >-
python=3.9
jupyterlab=4
Expand Down Expand Up @@ -46,28 +46,14 @@ jobs:
restore-keys: |
yarn-

- name: Setup OpenCascade build cache
uses: actions/cache@v2
with:
path: |
packages/opencascade/lib/jupytercad.opencascade.js
packages/opencascade/lib/jupytercad.opencascade.wasm
packages/opencascade/lib/jupytercad.opencascade.d.ts
packages/opencascade/lib/jupytercad.opencascade.version
key: ${{ hashFiles('packages/opencascade/build.yml') }}

- name: Build the extension
shell: bash -l {0}
run: |
set -eux
yarn install
yarn dev
jupyter labextension list 2>&1 | grep -ie "jupytercad-core.*OK"
jupyter labextension list 2>&1 | grep -ie "jupytercad-lab.*OK"

- name: Test import
shell: bash -l {0}
run: python -c "import jupytercad_app"
jupyter labextension list 2>&1 | grep -ie "jupytergis-core.*OK"
jupyter labextension list 2>&1 | grep -ie "jupytergis-lab.*OK"

- name: Package the extension
shell: bash -l {0}
Expand All @@ -81,9 +67,8 @@ jobs:
with:
name: extension-artifacts
path: |
python/jupytercad_core/dist/jupytercad*
python/jupytercad_lab/dist/jupytercad*
python/jupytercad_app/dist/jupytercad*
python/jupytergis_core/dist/jupytergis*
python/jupytergis_lab/dist/jupytergis*
if-no-files-found: error

test_isolated:
Expand All @@ -109,12 +94,11 @@ jobs:
sudo rm -rf $(which node)
sudo rm -rf $(which node)

cp ./jupytercad_core/dist/jupytercad*.whl ./jupytercad_lab/dist/jupytercad*.whl ./jupytercad_app/dist/jupytercad*.whl .
python -m pip install "jupyterlab>=4.0.0" jupytercad*.whl
cp ./jupytergis_core/dist/jupytergis*.whl ./jupytergis_lab/dist/jupytergis*.whl .
python -m pip install "jupyterlab>=4.0.0" jupytergis*.whl

jupyter labextension list
jupyter labextension list 2>&1 | grep -ie "jupytercad.*OK"
jupyter cad --version
jupyter labextension list 2>&1 | grep -ie "jupytergis.*OK"
# jupyterlab.browser_check will fail due to the core extension jupyterlab_pygments.
# It does not support lab v4.0.0
#python -m jupyterlab.browser_check --no-chrome-test
Expand All @@ -135,7 +119,7 @@ jobs:
uses: mamba-org/setup-micromamba@v1
with:
micromamba-version: '1.5.5-0'
environment-name: cad
environment-name: gis
create-args: >-
python=3.9
jupyterlab
Expand All @@ -150,8 +134,8 @@ jobs:
shell: bash -l {0}
run: |
set -eux
cp ./jupytercad_core/dist/jupytercad*.whl ./jupytercad_lab/dist/jupytercad*.whl ./jupytercad_app/dist/jupytercad*.whl .
python -m pip install jupytercad*.whl
cp ./jupytergis_core/dist/jupytergis*.whl ./jupytergis_lab/dist/jupytergis*.whl .
python -m pip install jupytergis*.whl

- name: Install dependencies
shell: bash -l {0}
Expand Down Expand Up @@ -182,7 +166,7 @@ jobs:
if: always()
uses: actions/upload-artifact@v3
with:
name: jupytercad-playwright-tests
name: jupytergis-playwright-tests
path: |
ui-tests/test-results
ui-tests/playwright-report
Expand Down Expand Up @@ -225,15 +209,15 @@ jobs:
shell: bash -l {0}
run: |
set -eux
cp ./jupytercad_core/dist/jupytercad*.whl ./jupytercad_lab/dist/jupytercad*.whl ./jupytercad_app/dist/jupytercad*.whl .
python -m pip install jupytercad*.whl
cp ./jupytergis_core/dist/jupytergis*.whl ./jupytergis_lab/dist/jupytergis*.whl .
python -m pip install jupytergis*.whl

- name: Build the lite site
shell: bash -l {0}
working-directory: lite
run: |
set -eux
mkdir -p content && cp ../examples/test.jcad ./content
mkdir -p content && cp ../examples/test.jGIS ./content
jupyter lite build --contents content --output-dir dist

- name: Upload artifact
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Install Conda environment with Micromamba
uses: mamba-org/setup-micromamba@v1
with:
environment-name: cad
environment-name: gis
create-args: >-
python=3.9
jupyterlab=4
Expand All @@ -33,5 +33,5 @@ jobs:
- name: Upload Distributions
uses: actions/upload-artifact@v3
with:
name: jupytercad-releaser-dist-${{ github.run_number }}
name: jupytergis-releaser-dist-${{ github.run_number }}
path: .jupyter_releaser_checkout/dist
2 changes: 1 addition & 1 deletion .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Install Conda environment with Micromamba
uses: mamba-org/setup-micromamba@v1
with:
environment-name: cad
environment-name: gis
create-args: >-
python=3.9
jupyterlab=4.0.12
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/update_galata_references.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- name: Install Conda environment with Micromamba
uses: mamba-org/setup-micromamba@v1
with:
environment-name: cad
environment-name: gis
create-args: >-
python=3.9
jupyterlab=4
Expand All @@ -56,8 +56,8 @@ jobs:
shell: bash -l {0}
run: |
whereis python
cp ./jupytercad_core/dist/jupytercad*.whl ./jupytercad_lab/dist/jupytercad*.whl ./jupytercad_app/dist/jupytercad*.whl .
python -m pip install jupytercad*.whl
cp ./jupytergis_core/dist/jupytergis*.whl ./jupytergis_lab/dist/jupytergis*.whl .
python -m pip install jupytergis*.whl
- name: Install dependencies
shell: bash -l {0}
Expand Down
40 changes: 2 additions & 38 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,39 +1,3 @@
# JupyterGIS - A JupyterLab extension for 3D geometry modeling.
# JupyterGIS - A JupyterLab extension for GIS.

[![Lite](https://jupyterlite.rtfd.io/en/latest/_static/badge.svg)](https://QuantStack.github.io/jupytergis/)

JupyterGIS

## Requirements

- JupyterLab >= 4.0.0

## Installation

You can install JupyterGIS using conda/mamba:

```bash
mamba install -c conda-forge jupytergis
```

Or using pip:

```bash
pip install jupytergis
```

Once you have installed the extension, you should be able to open and edit `.fcstd` files in JupyterLab.

## Documentation

Check out the JupyterGIS documentation on ReadTheDocs!

## Contributing

JupyterGIS is an open-source project, and contributions are always welcome. If you would like to contribute to JupyterGIS, please fork the repository and submit a pull request.

See [CONTRIBUTING](CONTRIBUTING.md) for dev installation instructions.

## License

JupyterGIS is licensed under the BSD 3-Clause License. See the LICENSE file for more information.
This is WIP
4 changes: 4 additions & 0 deletions examples/test.jGIS
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"layers": [],
"options": {}
}
29 changes: 0 additions & 29 deletions python/jupytergis_lab/style/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -353,35 +353,6 @@ div.jGIS-toolbar-widget > div.jp-Toolbar-item:last-child {
display: none;
}

.jGIS-sketcher-SketcherDialog .jp-Dialog-content {
max-width: unset !important;
max-height: unset !important;
width: 75vw;
height: 75vh;
}

.jGIS-sketcher-Sketcher {
background-color: var(--jp-layout-color2);
border-radius: 5px;
display: flex;
flex-direction: column;
}

.jGIS-sketcher-Sketcher-Toolbar {
min-height: var(--jp-private-toolbar-height);
width: 100%;
height: 29px;
display: flex;
}

.jGIS-sketcher-Sketcher-Statusbar {
height: 20px;
position: absolute;
bottom: 0;
right: 5px;
font-size: var(--jp-ui-font-size0);
}

.highlight {
background-color: var(--jp-layout-color2) !important;
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
104 changes: 0 additions & 104 deletions ui-tests/tests/sketcher.spec.ts

This file was deleted.

Binary file not shown.
Binary file not shown.
Loading
Loading