Merge branch 'master' into patch-1

.github/dependabot.yml

@@ -0,0 +1,13 @@
+version: 2
+
+enable-beta-ecosystems: true
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/deploy.yml

@@ -0,0 +1,41 @@
+name: Deploy
+
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+          cache: 'pip'
+
+      - name: Upgrade pip
+        run: python3 -m pip install --upgrade pip
+
+      - name: Install dependencies
+        run: python3 -m pip install -r requirements.txt
+
+      - name: Build
+        run: |
+          make html
+          cp -r images _build/html
+          cp CNAME _build/html
+          touch _build/html/.nojekyll
+
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v4
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: _build/html

.github/workflows/pull-request.yml

@@ -0,0 +1,32 @@
+name: Build
+
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+          cache: 'pip'
+
+      - name: Upgrade pip
+        run: python3 -m pip install --upgrade pip
+
+      - name: Install dependencies
+        run: python3 -m pip install -r requirements.txt
+
+      - name: Build
+        run: |
+          make html
+          cp -r images _build/html
+          cp CNAME _build/html
+          touch _build/html/.nojekyll

collaborate/Readme.md

@@ -1,18 +1,85 @@
 Collaborate with PSLab!
 =======================
 
-Pocket Science Lab Experiments
-------------------------------
+Welcome to the PSLab (Pocket Science Lab) collaboration guide. This document will help you get started with contributing to the PSLab repository.
 
-The PSLab repository allows anyone to contribute. One way is to create
-experiments for [Pocket Science Lab.](https://github.com/fossasia?q=pslab).
+## Pocket Science Lab Experiments
 
-See also the template `tutorials/template.md`.
+One of the best ways to contribute to PSLab is by creating experiments. These experiments help users explore the capabilities of the Pocket Science Lab and learn about various scientific concepts.
 
-## Instructions
+### Creating an Experiment
 
 1. Fork the repository
-2. Create and/or edit files using your editor
+2. Create and/or edit files using your preferred editor
+3. Follow the structure outlined in `tutorials/template.md`
+
+## File Formats
+
+We primarily use Markdown (.md) for our documentation. However, please note:
+
+- The main document headlines (typically the first one at the top of the file) should be written in reStructuredText (ReST) format for compatibility with Sphinx documentation.
+- The rest of the content should be in Markdown format.
 
 For convenience, you can use [notex](https://www.notex.ch), an
 [open-source](https://github.com/hsk81/notex-v2.0) ReST editor.
+
+## Editing Tools
+
+While you can use any text editor of your choice, we recommend using open-source Markdown editors for convenience. Some options include:
+
+- Visual Studio Code with Markdown extensions
+- Typora
+- MarkText
+- Joplin
+
+These editors provide live previews and other helpful features for writing Markdown.
+
+## How to Contribute
+
+### Reporting Bugs
+
+- Before submitting a bug report, please check our issue tracker to see if the bug has already been reported.
+- If you're unable to find an open issue addressing the problem, open a new one.
+- When you are creating a bug report, please include as many details as possible:
+  - Use a clear and descriptive title
+  - Describe the exact steps which reproduce the problem
+  - Provide specific examples to demonstrate the steps
+  - Describe the behavior you observed after following the steps
+  - Explain which behavior you expected to see instead and why
+  - Include screenshots if possible
+  - Include your environment details (OS, browser version, etc.)
+
+### Suggesting Enhancements
+
+- Use a clear and descriptive title for the issue to identify the suggestion.
+- Provide a step-by-step description of the suggested enhancement in as many details as possible.
+- Provide specific examples to demonstrate the steps or point out the part of PSLab where the suggestion is related to.
+- Describe the current behavior and explain which behavior you expected to see instead and why.
+- Explain why this enhancement would be useful to most PSLab users.
+- List some other projects or applications where this enhancement exists, if applicable.
+
+### Your First Code Contribution
+
+- Start with our list of beginner-friendly issues labeled as "good first issue" in our issue tracker.
+- If you're just getting started with PSLab, consider working on documentation improvements or adding new experiments.
+- Don't hesitate to ask for help in our community channels if you're stuck.
+
+### Pull Requests
+
+- Fill in the required template when creating your pull request.
+- Do not include issue numbers in the PR title.
+- Follow our coding standards and style guides.
+- Include appropriate test cases if you're adding new functionality.
+- Ensure all tests pass before submitting your pull request.
+- Update the documentation, if relevant to your changes.
+
+## Submitting Your Contribution
+
+Once you've created or edited your files:
+
+1. Commit your changes to your forked repository
+2. Create a pull request to the main PSLab repository
+3. Wait for review and feedback from the maintainers
+
+Thank you for contributing to PSLab! Your efforts help make science more accessible to everyone.
+

conf.py

@@ -29,7 +29,9 @@
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = ['m2rr', 'sphinx_material']
+extensions = ['m2r2', 'sphinx_material']
+
+source_suffix = ['.rst', '.md']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -39,6 +41,7 @@
 # This pattern also affects html_static_path and html_extra_path.
 exclude_patterns = ['Readme.md', '.github', 'tutorials/template.md', '_build', 'Thumbs.db', '.DS_Store', '.venv']
 
+suppress_warnings = ["config.cache"]
 
 # -- Options for HTML output -------------------------------------------------
 

requirements.txt

@@ -1,34 +1,34 @@
-alabaster~=0.7.12
-Babel~=2.8.0
-beautifulsoup4~=4.9.1
-certifi~=2020.6.20
-chardet~=3.0.4
+alabaster~=1.0.0
+Babel~=2.16.0
+beautifulsoup4~=4.12.3
+certifi~=2024.8.30
+chardet~=5.2.0
 css-html-js-minify~=2.5.5
-docutils~=0.16
-idna~=2.10
-imagesize~=1.2.0
-Jinja2~=2.11.2
-lxml~=4.5.2
-m2rr~=0.2.3
-MarkupSafe~=1.1.1
+docutils~=0.21.2
+idna~=3.10
+imagesize~=1.4.1
+Jinja2~=3.1.4
+lxml~=5.3.0
+m2r2~=0.3.3.post2
+MarkupSafe~=2.1.5
 mistune~=0.8.4
-packaging~=20.4
-Pygments~=2.6.1
-pyparsing~=2.4.7
-python-slugify~=4.0.1
-pytz~=2020.1
-requests~=2.24.0
-six~=1.15.0
-snowballstemmer~=2.0.0
-soupsieve~=2.0.1
-Sphinx~=3.2.1
-sphinx-material~=0.0.30
-sphinxcontrib-applehelp~=1.0.2
-sphinxcontrib-devhelp~=1.0.2
-sphinxcontrib-htmlhelp~=1.0.3
+packaging~=24.1
+Pygments~=2.18.0
+pyparsing~=3.1.4
+python-slugify~=8.0.4
+pytz~=2024.2
+requests~=2.32.3
+six~=1.16.0
+snowballstemmer~=2.2.0
+soupsieve~=2.6
+Sphinx~=8.0.2
+sphinx-material~=0.0.36
+sphinxcontrib-applehelp~=2.0.0
+sphinxcontrib-devhelp~=2.0.0
+sphinxcontrib-htmlhelp~=2.1.0
 sphinxcontrib-jsmath~=1.0.1
-sphinxcontrib-qthelp~=1.0.3
-sphinxcontrib-serializinghtml~=1.1.4
+sphinxcontrib-qthelp~=2.0.0
+sphinxcontrib-serializinghtml~=2.0.0
 text-unidecode~=1.3
-Unidecode~=1.1.1
-urllib3~=1.25.10
+Unidecode~=1.3.8
+urllib3~=2.2.3