Merge pull request #149 from BerkeleyLearnVerify/3.x

Scenic 3 public release

Author: dfremont

.git-blame-ignore-revs

@@ -0,0 +1,3 @@
+# .git-blame-ignore-revs
+# Ran isort and black on the whole codebase
+360c67fab09d172498b3014510ee3658643d12da

.github/workflows/check-formatting.yml

@@ -0,0 +1,19 @@
+name: format
+
+on:
+  push:
+  pull_request:
+  workflow_call:
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Run black to check formatting
+        uses: psf/black@stable
+
+      - name: Run isort to check import order
+        uses: isort/isort-action@v1

.github/workflows/run-tests.yml

@@ -26,34 +26,73 @@ on:
         type: string
 
 jobs:
-  build:
+  check-format:
+    uses: ./.github/workflows/check-formatting.yml
+
+  test:
     strategy:
       fail-fast: true
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
         os: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.os }}
+
     steps:
     - name: Checkout given ref
       uses: actions/checkout@v3
       if: inputs.ref != ''
       with:
         ref: ${{ inputs.ref }}
+
     - name: Checkout current branch
       uses: actions/checkout@v3
       if: inputs.ref == ''
       with:
         ref: ${{ github.ref }}
+
+    - name: Install non-Python dependencies (Linux)
+      if: ${{ matrix.os == 'ubuntu-latest' }}
+      uses: awalsh128/cache-apt-pkgs-action@latest
+      with:
+        packages: blender openscad
+
+    - name: Restore cached non-Python dependencies (Windows)
+      id: windows-cache-deps
+      if: ${{ matrix.os == 'windows-latest' }}
+      uses: actions/cache@v3
+      with:
+        path: downloads
+        key: windows-deps
+
+    - name: Download non-Python dependencies (Windows)
+      if: ${{ matrix.os == 'windows-latest' && steps.windows-cache-deps.outputs.cache-hit != 'true' }}
+      run: |
+        New-Item -Path downloads -ItemType Directory -Force
+        Invoke-WebRequest https://files.openscad.org/OpenSCAD-2021.01-x86-64.zip -O downloads/openscad.zip
+        Invoke-WebRequest https://download.blender.org/release/Blender3.6/blender-3.6.0-windows-x64.zip -O downloads/blender.zip
+
+    - name: Install non-Python dependencies (Windows)
+      if: ${{ matrix.os == 'windows-latest' }}
+      run: |
+        Expand-Archive -Path downloads/openscad.zip -DestinationPath openscad
+        Move-Item -Path openscad/openscad-2021.01 -Destination $Env:Programfiles\OpenSCAD
+        Expand-Archive -Path downloads/blender.zip -DestinationPath blender
+        Move-Item -Path blender/blender-3.6.0-windows-x64 -Destination "$Env:Programfiles\Blender Foundation\Blender"
+
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
+        cache: 'pip'
+
     - name: Update pip
       run: |
         python -m pip install --upgrade pip
+
     - name: Install Scenic and dependencies
       run: |
         python -m pip install -e ".[test]"
+
     - name: Run pytest
       run: |
         pytest ${{ inputs.options || '--no-graphics' }}

.gitignore

@@ -110,10 +110,11 @@ celerybeat-schedule
 .env
 .venv
 env/
-venv/
+venv*/
 ENV/
 env.bak/
 venv.bak/
+scenic.venv/
 
 # Spyder project settings
 .spyderproject
@@ -131,3 +132,6 @@ venv.bak/
 dmypy.json
 
 *.cproject
+
+# generated parser
+src/scenic/syntax/parser.py

.pre-commit-config.yaml

@@ -0,0 +1,11 @@
+repos:
+  - repo: https://github.com/psf/black
+    rev: 23.3.0
+    hooks:
+      - id: black
+        language_version: python3.11
+
+  - repo: https://github.com/pycqa/isort
+    rev: 5.12.0
+    hooks:
+      - id: isort

Makefile

@@ -0,0 +1,16 @@
+GRAMMAR = ./src/scenic/syntax/scenic.gram
+PARSER = ./src/scenic/syntax/parser.py
+
+.PHONY: all
+all: $(PARSER)
+
+$(PARSER): $(GRAMMAR)
+	python -m pegen $(GRAMMAR) -o $(PARSER)
+
+format:
+	isort .
+	black .
+
+.PHONY: clean
+clean:
+	-rm $(PARSER)