Skip to content

Commit

Permalink
Merge branch 'main' into markdown-link-browser-rendering
Browse files Browse the repository at this point in the history
  • Loading branch information
cmeier76 authored Dec 6, 2024
2 parents 038a672 + 74d86d7 commit b91ebe7
Show file tree
Hide file tree
Showing 580 changed files with 35,075 additions and 10,806 deletions.
78 changes: 78 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-docker-compose
{
"name": "ZMS Development Environment",
// Update the 'dockerComposeFile' list if you have more compose files or use different names.
// The .devcontainer/docker-compose.yml file contains any overrides you need/want to make.
"dockerComposeFile": ["../docker-compose.yml", "docker-compose.yml"],
// The 'service' property is the name of the service for the container that VS Code should
// use. Update this value and .devcontainer/docker-compose.yml to the real service name.
"service": "zope",
// The optional 'workspaceFolder' property is the path VS Code should open by default when
// connected. This is typically a file mount in .devcontainer/docker-compose.yml
"workspaceFolder": "/home/zope/",
// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},
// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],
// Uncomment the next line if you want start specific services in your Docker Compose config.
// "runServices": [],
// Uncomment the next line if you want to keep your containers running after VS Code shuts down.
"shutdownAction": "stopCompose",
// Uncomment the next line to run commands after the container is created.
// "postCreateCommand": "cat /etc/os-release",
// Configure tool-specific properties.
// "customizations": {},
"customizations": {
"vscode": {
"extensions": [
"ms-python.python",
"ms-python.vscode-pylance"
// "ms-python.autopep8"
],
"settings": {
"terminal.integrated.defaultProfile.linux": "bash",
"python.defaultInterpreterPath": "/home/zope/venv/bin/python",
"window.zoomLevel": 0,
"git.ignoreMissingGitWarning": true,
"editor.minimap.enabled": false,
"editor.renderWhitespace": "all",
"editor.renderControlCharacters": false,
"workbench.iconTheme": "vs-minimal",
"files.associations": {
"*.zpt": "html",
"*.zcml": "xml"
},
"scm.alwaysShowActions": true,
"files.exclude": {
"*.pyc": true,
"*-all.min.*": true,
"**/cache/**": true,
"**/Data.*": true
},
"search.exclude": {
"**/apidocs/**": true
},
"files.eol": "\n",
"files.autoSave": "afterDelay",
"workbench.colorTheme": "Visual Studio Light",
"python.linting.enabled": false,
"python.formatting.provider": "none"
// "python.testing.pytestEnabled": false,
// "python.testing.unittestEnabled": true,
// "python.testing.unittestArgs": [
// "-v",
// "-s",
// "./tests",
// "-p",
// "test*.py"
// ],
// "[python]": {
// "editor.defaultFormatter": "ms-python.autopep8"
// }
}
}
}
// Uncomment to connect as an existing user other than the container default. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "devcontainer"
}
6 changes: 6 additions & 0 deletions .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
services:
zope:
volumes:
- .:/home/zope/workspace/:cached
# Overrides default command so things don't shut down after the process ends.
command: sleep infinity
12 changes: 12 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
.devcontainer
.github
.ropeproject
.vscode
build
dist
docker/alpine/var
docker/elastic
docker/solr
docker/ubuntu/var
docker/zeo/var
docker/zope/var
87 changes: 44 additions & 43 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,48 +2,49 @@
name: tests

on:
push:
pull_request:
schedule:
- cron: '0 12 * * 0' # run once a week on Sunday
# Allow to run this workflow manually from the Actions tab
workflow_dispatch:
push:
pull_request:
schedule:
- cron: "0 12 * * 0" # run once a week on Sunday
# Allow to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
build:
strategy:
# We want to see all failures:
fail-fast: false
matrix:
os:
- ubuntu
config:
- "3.8"
- "3.9"
- "3.10"
- "3.11"
- "3.12"
runs-on: ${{ matrix.os }}-latest
name: ${{ matrix.os }}-${{ matrix.config }}
steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.config }}
- name: Pip cache
uses: actions/cache@v3
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ matrix.config }}-${{ hashFiles('setup.*', 'requirements*') }}
restore-keys: |
${{ runner.os }}-pip-${{ matrix.config }}-
${{ runner.os }}-pip-
- name: Install dependencies
run: |
python -m pip install --upgrade pip pytest
pip install -e .
- name: Test
run: |
tree -L 1
pytest ./tests/
build:
strategy:
# We want to see all failures:
fail-fast: false
matrix:
os:
- ubuntu
config:
- "3.8"
- "3.9"
- "3.10"
- "3.11"
- "3.12"
- "3.13"
runs-on: ${{ matrix.os }}-latest
name: ${{ matrix.os }}-${{ matrix.config }}
steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.config }}
- name: Pip cache
uses: actions/cache@v3
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ matrix.config }}-${{ hashFiles('setup.*', 'requirements*') }}
restore-keys: |
${{ runner.os }}-pip-${{ matrix.config }}-
${{ runner.os }}-pip-
- name: Install dependencies
run: |
python -m pip install --upgrade pip pytest
pip install -e .
- name: Test
run: |
tree -L 1
pytest ./tests/
12 changes: 10 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,15 @@ Products/zms/plugins/www/zms-all.min.js
Products/zms/plugins/www/i18n/*.js
Products/zms/overrides.zcml
.vscode/

*~
.*.swp

/.idea/

dist/
build/
docker/var/*
docker/var/log/
docker/**/var/*
docker/**/Extensions/*
/revisions.txt

66 changes: 66 additions & 0 deletions .vscode/Docker.code-workspace
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{
"folders": [
{
"name": "ZMS-Docker",
"path": "../.."
},
],
"settings": {
"python.defaultInterpreterPath": "/home/zope/venv/bin/python",
"window.zoomLevel": 0,
"git.ignoreMissingGitWarning": true,
"editor.minimap.enabled": false,
"editor.renderWhitespace": "all",
"editor.renderControlCharacters": false,
"workbench.iconTheme": "vs-minimal",
"files.associations": {
"*.zpt": "html",
"*.zcml": "xml"
},
"scm.alwaysShowActions": true,
"files.exclude": {
"*.pyc": true,
"*-all.min.*":true,
"**/cache/**": true,
"**/Data.*": true,
},
"search.exclude": {
"**/apidocs/**": true
},
"files.eol": "\n",
"files.autoSave": "afterDelay",
"workbench.colorTheme": "Visual Studio Light",
"python.linting.enabled": true
},
"launch": {
"version": "0.2.0",
"configurations": [
{
"name": "ZMS-Docker",
"type": "debugpy",
"request": "launch",
"justMyCode": false,
"console": "integratedTerminal",
"program": "/home/zope/venv/bin/runwsgi",
"args": [
"--debug",
"--verbose",
"/home/zope/etc/zope.ini",
],
"env": {
"PYTHONUNBUFFERED":"1",
"CONFIG_FILE": "/home/zope/etc/zope.ini",
"INSTANCE_HOME": "/home/zope/",
"CLIENT_HOME": "/home/zope/",
"PYTHON": "/home/zope/venv/bin/python",
"SOFTWARE_HOME": "/home/zope/venv/bin"
},
"serverReadyAction":{
"pattern":"Serving on http://0.0.0.0:80",
"uriFormat": "http://admin:[email protected]:80/manage_main",
"action": "openExternally",
},
},
]
}
}
110 changes: 110 additions & 0 deletions .vscode/Native.code-workspace
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
{
"folders": [
{
"name": "ZMS5",
"path": "../"
},
// {
// "name": "ZMS4",
// "path": "../../ZMS4"
// },
// {
// "name": "ZMS3",
// "path": "../../ZMS3"
// },
// {
// "name": "Zope 5",
// "path": "/home/zope/src/zopefoundation/Zope"
// },
// {
// "name": "ZMS5 Dev Instance",
// "path": "/home/zope/instance/zms5_dev"
// },
// {
// "name": "OpenSearchServer",
// "path": "/home/zope/src/sntl-projects/opensearch_demo"
// },
// {
// "name": "Zope-WebDAV Access",
// "uri": "webdav://admin:admin@localhost:8091/"
// },
// {
// "path": "../../../../vpy38/lib/python3.8/site-packages/pydoctor"
// }
],

"settings": {
"python.defaultInterpreterPath": "~/vpy313/bin/python",
"window.zoomLevel": 0,
"git.ignoreMissingGitWarning": true,
"editor.minimap.enabled": false,
"editor.renderWhitespace": "all",
"editor.renderControlCharacters": false,
"workbench.iconTheme": "vs-minimal",
"workbench.colorTheme": "Visual Studio Light",
"files.eol": "\n",
"files.autoSave": "afterDelay",
"files.associations": {
"*.zpt": "html",
"*.zcml": "xml"
},
"scm.alwaysShowActions": true,
"files.exclude": {
"*.pyc": true,
"*-all.min.*":true,
"**/cache/**": true,
"**/Data.*": true,
"**/docker/**/var/*": true
},
"search.exclude": {
"**/apidocs/**": true,
"*.pyc": true,
"*-all.min.*":true,
"**/cache/**": true,
"**/Data.*": true,
"**/docker/**/var/*": true
},
"python.testing.pytestEnabled": false,
"python.testing.unittestEnabled": true,
"python.testing.unittestArgs": [
"-v",
"-s",
"./tests",
"-p",
"test*.py"
],
},

"launch": {
"version": "0.2.0",
"configurations": [
{
"name": "ZMS5-DEV",
"type": "debugpy",
"request": "launch",
"program": "~/vpy313/bin/runwsgi",
"justMyCode": false,
"console": "integratedTerminal",
"args": [
"--debug",
"--verbose",
"~/instance/zms5_dev/etc/zope.ini",
"debug-mode=on"
],
"env": {
"PYTHONUNBUFFERED": "1",
"CONFIG_FILE": "~/instance/zms5_dev/etc/zope.ini",
"INSTANCE_HOME": "~/instance/zms5_dev",
"CLIENT_HOME": "~/instance/zms5_dev",
"PYTHON": "~/vpy313/bin/python",
"SOFTWARE_HOME": "~/vpy313/bin/"
},
"serverReadyAction": {
"pattern": "Serving on http://127.0.0.1:8081",
"uriFormat": "http://127.0.0.1:8081/manage_main",
"action": "openExternally"
}
}
]
}
}
Loading

0 comments on commit b91ebe7

Please sign in to comment.