pyscript · pww217 · May 20, 2022 · May 18, 2022 · May 18, 2022 · May 18, 2022
diff --git a/.github/workflows/build-alpha.yml b/.github/workflows/build-alpha.yml
@@ -10,47 +10,67 @@ on:
         -   pyscriptjs/**
         -   .github/workflows/build-alpha.yml # Test that workflow works when changed
 
+env:
+    MINICONDA_PYTHON_VERSION: py38
+    MINICONDA_VERSION: 4.11.0
+
+defaults:
+    run:
+        working-directory: pyscriptjs
+
 jobs:
     build:
         runs-on: ubuntu-latest
         permissions:
             contents: read
             id-token: write
-        defaults:
-            run:
-                working-directory: pyscriptjs
-
         steps:
+
         -   name: Checkout
             uses: actions/checkout@v3
+
         -   name: Install node
             uses: actions/setup-node@v3
             with:
                 node-version: 18.x
+
         -   name: Cache node modules
             uses: actions/cache@v3
             env:
                 cache-name: cache-node-modules
             with:
-                # npm cache files are stored in `~/.npm` on Linux/macOS
+              # npm cache files are stored in `~/.npm` on Linux/macOS
                 path: ~/.npm
                 key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
                 restore-keys: |
                     ${{ runner.os }}-build-${{ env.cache-name }}-
                     ${{ runner.os }}-build-
                     ${{ runner.os }}-
+
+        -   name: Install miniconda
+            run: |
+                curl -L -O https://repo.continuum.io/miniconda/Miniconda3-${MINICONDA_PYTHON_VERSION}_${MINICONDA_VERSION}-Linux-x86_64.sh \
+                && bash Miniconda3-${MINICONDA_PYTHON_VERSION}_${MINICONDA_VERSION}-Linux-x86_64.sh -b -p conda/
+
         -   name: Install dependencies
             run: |
                 npm install
+                make setup CONDA_EXE=conda/bin/conda
+
+        -   name: Test pyscript
+            run: make test CONDA_EXE=conda/bin/conda
+
         -   name: Build pyscript
-            run: |
-                npm run build
+            run: make build
 
         # Deploy to S3
         -   name: Configure AWS credentials
+            if: github.ref == 'refs/heads/main' # Only deploy on merge into main
             uses: aws-actions/configure-aws-credentials@v1.6.1
             with:
                 aws-region: ${{secrets.AWS_REGION}}
                 role-to-assume: ${{ secrets.AWS_OIDC_RUNNER_ROLE }}
+
         -   name: Sync to S3
+            if: github.ref == 'refs/heads/main'
             run: aws s3 sync --quiet ./examples/build/ s3://pyscript.net/alpha/
diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml
@@ -15,23 +15,30 @@ on:
         -   pyscriptjs/**
         -   .github/workflows/build-latest.yml # Test that workflow works when changed
 
+env:
+    MINICONDA_PYTHON_VERSION: py38
+    MINICONDA_VERSION: 4.11.0
+
+defaults:
+    run:
+        working-directory: pyscriptjs
+
 jobs:
     build:
         runs-on: ubuntu-latest
         permissions:
             contents: read
             id-token: write
-        defaults:
-            run:
-                working-directory: pyscriptjs
-
         steps:
+
         -   name: Checkout
             uses: actions/checkout@v3
+
         -   name: Install node
             uses: actions/setup-node@v3
             with:
                 node-version: 18.x
+
         -   name: Cache node modules
             uses: actions/cache@v3
             env:
@@ -44,12 +51,21 @@ jobs:
                     ${{ runner.os }}-build-${{ env.cache-name }}-
                     ${{ runner.os }}-build-
                     ${{ runner.os }}-
+        -   name: Install miniconda
+            run: |
+                curl -L -O https://repo.continuum.io/miniconda/Miniconda3-${MINICONDA_PYTHON_VERSION}_${MINICONDA_VERSION}-Linux-x86_64.sh \
+                && bash Miniconda3-${MINICONDA_PYTHON_VERSION}_${MINICONDA_VERSION}-Linux-x86_64.sh -b -p conda/
+
         -   name: Install dependencies
             run: |
                 npm install
+                make setup CONDA_EXE=conda/bin/conda
+
+        -   name: Test pyscript
+            run: make test CONDA_EXE=conda/bin/conda
+
         -   name: Build pyscript
-            run: |
-                npm run build
+            run: make build
 
         # Deploy to S3
         -   name: Configure AWS credentials
@@ -58,6 +74,7 @@ jobs:
             with:
                 aws-region: ${{secrets.AWS_REGION}}
                 role-to-assume: ${{ secrets.AWS_OIDC_RUNNER_ROLE }}
+
         -   name: Sync to S3
             if: github.ref == 'refs/heads/main'
             run: aws s3 sync --quiet ./examples/build/ s3://pyscript.net/unstable
diff --git a/.github/workflows/docs-latest.yml b/.github/workflows/docs-latest.yml
@@ -4,6 +4,8 @@ on:
     push:
         branches:
         -   main
+        paths:
+        -   docs/**
 
 jobs:
     build:

diff --git a/.github/workflows/docs-release.yml b/.github/workflows/docs-release.yml
@@ -4,6 +4,8 @@ on:
   # Any time a tag or branch is created
   # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#create
     create:
+        paths:
+        -   docs/**
 
 jobs:
     build:

diff --git a/.github/workflows/docs-review.yml b/.github/workflows/docs-review.yml
@@ -4,6 +4,8 @@ on:
     pull_request:
         branches:
         -   '*'
+        paths:
+        -   docs/**
 
 concurrency:
   # Concurrency group that uses the workflow name and PR number if available

diff --git a/pyscriptjs/Makefile b/pyscriptjs/Makefile
@@ -8,12 +8,12 @@ app_dir ?= $(shell git rev-parse --show-prefix)
 
 CONDA_ENV ?= ./env
 env := $(CONDA_ENV)
-conda_run := conda run -p $(env)
+conda_run := $(CONDA_EXE) run -p $(env)
 
 setup:
-	@if [ -z "$${CONDA_SHLVL:
4FD0
+x}" ]; then echo "Conda is not installed." && exit 1; fi
 	$(CONDA_EXE) env $(shell [ -d $(env) ] && echo update || echo create) -p $(env) --file environment.yml
 	$(conda_run) playwright install
+	$(CONDA_EXE) install -c anaconda pytest
 
 clean:
 	find . -name \*.py[cod] -delete
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,8 @@ on: @@
         push:
             branches:
             -   main
+            paths:
+            -   docs/**
     jobs:
         build:
@@ Expand Down @@