-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
0 parents
commit c5a1bf5
Showing
30 changed files
with
1,130 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
# Changes here will be overwritten by Copier | ||
_commit: 2.1.0 | ||
_src_path: gh:DiamondLightSource/python-copier-template | ||
author_email: [email protected] | ||
author_name: David Perl | ||
component_owner: group:default/sscc | ||
description: an service to put and get your config values from | ||
distribution_name: config-service | ||
docker: true | ||
docs_type: README | ||
git_platform: github.com | ||
github_org: dperl-dls | ||
package_name: config_service | ||
pypi: true | ||
repo_name: config-service | ||
type_checker: pyright |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
// For format details, see https://containers.dev/implementors/json_reference/ | ||
{ | ||
"name": "Python 3 Developer Container", | ||
"build": { | ||
"dockerfile": "../Dockerfile", | ||
"target": "developer" | ||
}, | ||
"remoteEnv": { | ||
// Allow X11 apps to run inside the container | ||
"DISPLAY": "${localEnv:DISPLAY}" | ||
}, | ||
"customizations": { | ||
"vscode": { | ||
// Set *default* container specific settings.json values on container create. | ||
"settings": { | ||
"python.defaultInterpreterPath": "/venv/bin/python" | ||
}, | ||
// Add the IDs of extensions you want installed when the container is created. | ||
"extensions": [ | ||
"ms-python.python", | ||
"github.vscode-github-actions", | ||
"tamasfe.even-better-toml", | ||
"redhat.vscode-yaml", | ||
"ryanluker.vscode-coverage-gutters", | ||
"charliermarsh.ruff", | ||
"ms-azuretools.vscode-docker" | ||
] | ||
} | ||
}, | ||
"features": { | ||
// Some default things like git config | ||
"ghcr.io/devcontainers/features/common-utils:2": { | ||
"upgradePackages": false | ||
} | ||
}, | ||
"runArgs": [ | ||
// Allow the container to access the host X11 display and EPICS CA | ||
"--net=host", | ||
// Make sure SELinux does not disable with access to host filesystems like tmp | ||
"--security-opt=label=disable" | ||
], | ||
// Mount the parent as /workspaces so we can pip install peers as editable | ||
"workspaceMount": "source=${localWorkspaceFolder}/..,target=/workspaces,type=bind", | ||
// After the container is created, install the python project in editable form | ||
"postCreateCommand": "pip install $([ -f dev-requirements.txt ] && echo '-c dev-requirements.txt') -e '.[dev]' && pre-commit install" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
# Contribute to the project | ||
|
||
Contributions and issues are most welcome! All issues and pull requests are | ||
handled through [GitHub](https://github.com/dperl-dls/config-service/issues). Also, please check for any existing issues before | ||
filing a new one. If you have a great idea but it involves big changes, please | ||
file a ticket before making a pull request! We want to make sure you don't spend | ||
your time coding something that might not fit the scope of the project. | ||
|
||
## Issue or Discussion? | ||
|
||
Github also offers [discussions](https://github.com/dperl-dls/config-service/discussions) as a place to ask questions and share ideas. If | ||
your issue is open ended and it is not obvious when it can be "closed", please | ||
raise it as a discussion instead. | ||
|
||
## Code Coverage | ||
|
||
While 100% code coverage does not make a library bug-free, it significantly | ||
reduces the number of easily caught bugs! Please make sure coverage remains the | ||
same or is improved by a pull request! | ||
|
||
## Developer Information | ||
|
||
It is recommended that developers use a [vscode devcontainer](https://code.visualstudio.com/docs/devcontainers/containers). This repository contains configuration to set up a containerized development environment that suits its own needs. | ||
|
||
This project was created using the [Diamond Light Source Copier Template](https://github.com/DiamondLightSource/python-copier-template) for Python projects. | ||
|
||
For more information on common tasks like setting up a developer environment, running the tests, and setting a pre-commit hook, see the template's [How-to guides](https://diamondlightsource.github.io/python-copier-template/2.1.0/how-to.html). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
name: Install requirements | ||
description: Install a version of python then call pip install and report what was installed | ||
inputs: | ||
python-version: | ||
description: Python version to install, default is from Dockerfile | ||
default: "dev" | ||
pip-install: | ||
description: Parameters to pass to pip install | ||
default: "$([ -f dev-requirements.txt ] && echo '-c dev-requirements.txt') -e .[dev]" | ||
|
||
runs: | ||
using: composite | ||
steps: | ||
- name: Get version of python | ||
run: | | ||
PYTHON_VERSION="${{ inputs.python-version }}" | ||
if [ $PYTHON_VERSION == "dev" ]; then | ||
PYTHON_VERSION=$(sed -n "s/ARG PYTHON_VERSION=//p" Dockerfile) | ||
fi | ||
echo "PYTHON_VERSION=$PYTHON_VERSION" >> "$GITHUB_ENV" | ||
shell: bash | ||
|
||
- name: Setup python | ||
uses: actions/setup-python@v5 | ||
with: | ||
python-version: ${{ env.PYTHON_VERSION }} | ||
|
||
- name: Install packages | ||
run: pip install ${{ inputs.pip-install }} | ||
shell: bash | ||
|
||
- name: Report what was installed | ||
run: pip freeze | ||
shell: bash |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
# To get started with Dependabot version updates, you'll need to specify which | ||
# package ecosystems to update and where the package manifests are located. | ||
# Please see the documentation for all configuration options: | ||
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates | ||
|
||
version: 2 | ||
updates: | ||
- package-ecosystem: "github-actions" | ||
directory: "/" | ||
schedule: | ||
interval: "weekly" | ||
groups: | ||
actions: | ||
patterns: | ||
- "*" | ||
|
||
- package-ecosystem: "pip" | ||
directory: "/" | ||
schedule: | ||
interval: "weekly" | ||
groups: | ||
dev-dependencies: | ||
patterns: | ||
- "*" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
<!DOCTYPE html> | ||
<html> | ||
|
||
<head> | ||
<title>Redirecting to main branch</title> | ||
<meta charset="utf-8"> | ||
<meta http-equiv="refresh" content="0; url=./main/index.html"> | ||
<link rel="canonical" href="main/index.html"> | ||
</head> | ||
|
||
</html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,95 @@ | ||
import json | ||
import logging | ||
from argparse import ArgumentParser | ||
from pathlib import Path | ||
from subprocess import CalledProcessError, check_output | ||
from typing import List, Optional | ||
|
||
|
||
def report_output(stdout: bytes, label: str) -> List[str]: | ||
ret = stdout.decode().strip().split("\n") | ||
print(f"{label}: {ret}") | ||
return ret | ||
|
||
|
||
def get_branch_contents(ref: str) -> List[str]: | ||
"""Get the list of directories in a branch.""" | ||
stdout = check_output(["git", "ls-tree", "-d", "--name-only", ref]) | ||
return report_output(stdout, "Branch contents") | ||
|
||
|
||
def get_sorted_tags_list() -> List[str]: | ||
"""Get a list of sorted tags in descending order from the repository.""" | ||
stdout = check_output(["git", "tag", "-l", "--sort=-v:refname"]) | ||
return report_output(stdout, "Tags list") | ||
|
||
|
||
def get_versions(ref: str, add: Optional[str]) -> List[str]: | ||
"""Generate the file containing the list of all GitHub Pages builds.""" | ||
# Get the directories (i.e. builds) from the GitHub Pages branch | ||
try: | ||
builds = set(get_branch_contents(ref)) | ||
except CalledProcessError: | ||
builds = set() | ||
logging.warning(f"Cannot get {ref} contents") | ||
|
||
# Add and remove from the list of builds | ||
if add: | ||
builds.add(add) | ||
|
||
# Get a sorted list of tags | ||
tags = get_sorted_tags_list() | ||
|
||
# Make the sorted versions list from main branches and tags | ||
versions: List[str] = [] | ||
for version in ["master", "main"] + tags: | ||
if version in builds: | ||
versions.append(version) | ||
builds.remove(version) | ||
|
||
# Add in anything that is left to the bottom | ||
versions += sorted(builds) | ||
print(f"Sorted versions: {versions}") | ||
return versions | ||
|
||
|
||
def write_json(path: Path, repository: str, versions: str): | ||
org, repo_name = repository.split("/") | ||
pages_url = f"https://{org}.github.io" | ||
if repo_name != f"{org}.github.io": | ||
# Only add the repo name if it isn't the source for the org pages site | ||
pages_url += f"/{repo_name}" | ||
struct = [ | ||
{"version": version, "url": f"{pages_url}/{version}/"} for version in versions | ||
] | ||
text = json.dumps(struct, indent=2) | ||
print(f"JSON switcher:\n{text}") | ||
path.write_text(text, encoding="utf-8") | ||
|
||
|
||
def main(args=None): | ||
parser = ArgumentParser( | ||
description="Make a versions.json file from gh-pages directories" | ||
) | ||
parser.add_argument( | ||
"--add", | ||
help="Add this directory to the list of existing directories", | ||
) | ||
parser.add_argument( | ||
"repository", | ||
help="The GitHub org and repository name: ORG/REPO", | ||
) | ||
parser.add_argument( | ||
"output", | ||
type=Path, | ||
help="Path of write switcher.json to", | ||
) | ||
args = parser.parse_args(args) | ||
|
||
# Write the versions file | ||
versions = get_versions("origin/gh-pages", args.add) | ||
write_json(args.output, args.repository, versions) | ||
|
||
|
||
if __name__ == "__main__": | ||
main() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
on: | ||
workflow_call: | ||
outputs: | ||
branch-pr: | ||
description: The PR number if the branch is in one | ||
value: ${{ jobs.pr.outputs.branch-pr }} | ||
|
||
jobs: | ||
pr: | ||
runs-on: "ubuntu-latest" | ||
outputs: | ||
branch-pr: ${{ steps.script.outputs.result }} | ||
steps: | ||
- uses: actions/github-script@v7 | ||
id: script | ||
if: github.event_name == 'push' | ||
with: | ||
script: | | ||
const prs = await github.rest.pulls.list({ | ||
owner: context.repo.owner, | ||
repo: context.repo.repo, | ||
head: context.repo.owner + ':${{ github.ref_name }}' | ||
}) | ||
if (prs.data.length) { | ||
console.log(`::notice ::Skipping CI on branch push as it is already run in PR #${prs.data[0]["number"]}`) | ||
return prs.data[0]["number"] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
on: | ||
workflow_call: | ||
|
||
jobs: | ||
build: | ||
runs-on: ubuntu-latest | ||
|
||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v4 | ||
with: | ||
# Need this to get version number from last tag | ||
fetch-depth: 0 | ||
|
||
- name: Set up Docker Buildx | ||
id: buildx | ||
uses: docker/setup-buildx-action@v3 | ||
|
||
- name: Log in to GitHub Docker Registry | ||
if: github.event_name != 'pull_request' | ||
uses: docker/login-action@v3 | ||
with: | ||
registry: ghcr.io | ||
username: ${{ github.actor }} | ||
password: ${{ secrets.GITHUB_TOKEN }} | ||
|
||
- name: Build and export to Docker local cache | ||
uses: docker/build-push-action@v5 | ||
with: | ||
context: . | ||
# Need load and tags so we can test it below | ||
load: true | ||
tags: tag_for_testing | ||
|
||
- name: Test cli works in cached runtime image | ||
run: docker run --rm tag_for_testing --version | ||
|
||
- name: Create tags for publishing image | ||
id: meta | ||
uses: docker/metadata-action@v5 | ||
with: | ||
images: ghcr.io/${{ github.repository }} | ||
tags: | | ||
type=ref,event=tag | ||
type=raw,value=latest | ||
- name: Push cached image to container registry | ||
if: github.ref_type == 'tag' | ||
uses: docker/build-push-action@v5 | ||
# This does not build the image again, it will find the image in the | ||
# Docker cache and publish it | ||
with: | ||
context: . | ||
push: true | ||
tags: ${{ steps.meta.outputs.tags }} | ||
labels: ${{ steps.meta.outputs.labels }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
on: | ||
workflow_call: | ||
|
||
jobs: | ||
build: | ||
runs-on: "ubuntu-latest" | ||
|
||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v4 | ||
with: | ||
# Need this to get version number from last tag | ||
fetch-depth: 0 | ||
|
||
- name: Build sdist and wheel | ||
run: > | ||
export SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct) && | ||
pipx run build | ||
- name: Upload sdist and wheel as artifacts | ||
uses: actions/upload-artifact@v4 | ||
with: | ||
name: dist | ||
path: dist | ||
|
||
- name: Check for packaging errors | ||
run: pipx run twine check --strict dist/* | ||
|
||
- name: Install produced wheel | ||
uses: ./.github/actions/install_requirements | ||
with: | ||
pip-install: dist/*.whl | ||
|
||
- name: Test module --version works using the installed wheel | ||
# If more than one module in src/ replace with module name to test | ||
run: python -m $(ls --hide='*.egg-info' src | head -1) --version |
Oops, something went wrong.