Skip to content

Commit

Permalink
Merge pull request #1733 from open-contracting/logo-1.1
Browse files Browse the repository at this point in the history
ui: Update logo (1.1)
  • Loading branch information
jpmckinney authored Jan 29, 2025
2 parents 715687a + 529604c commit 329d32d
Show file tree
Hide file tree
Showing 26 changed files with 522 additions and 515 deletions.
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
57 changes: 12 additions & 45 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,48 +2,15 @@ name: CI
on: [push, pull_request]
jobs:
build:
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
submodules: true
- uses: actions/setup-python@v4
with:
python-version: 3.8
cache: pip
cache-dependency-path: '**/requirements*.txt'
# Don't install editable projects in the current working directory.
# https://pip.pypa.io/en/latest/reference/pip_install/#install-src
- run: pip install --src $GITHUB_WORKSPACE/../src -r requirements.txt
- if: github.repository == 'open-contracting/standard_profile_template'
run: make update extract
- run: make
# Disable linkcheck as it is too slow for development.
# - run: |
# make linkcheck
# rm -f output.json output.txt
# Google Chrome and ChromeDriver are already included.
# https://help.github.com/en/actions/reference/software-installed-on-github-hosted-runners
# https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-Readme.md
- run: pytest -W error
# Deploy the built documentation to the staging directory.
- if: github.event_name == 'push'
uses: shimataro/ssh-key-action@v2
with:
key: ${{ secrets.PRIVATE_KEY }}
known_hosts: standard.open-contracting.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGveFGTJ9yyObNGDUCUyzyFkm6Kzh3YqIt1qB7B/KU6E
- if: github.event_name == 'push'
uses: bcomnes/netrc-creds@v2
with:
machine: standard.open-contracting.org
login: manage
password: ${{ secrets.ELASTICSEARCH_PASSWORD }}
- if: github.event_name == 'push' && success() && github.repository != 'open-contracting/standard_profile_template'
env:
PATH_PREFIX: ""
PRODUCTION: ${{ startsWith(github.ref, 'refs/tags') || github.ref == 'refs/heads/latest' || github.ref == 'refs/heads/1.0' || github.ref == 'refs/heads/1.1' }}
RELEASE: ${{ startsWith(github.ref, 'refs/tags') }}
VERSION: "1.1"
shell: bash
run: curl -sS https://raw.githubusercontent.com/open-contracting/deploy/main/deploy-docs.sh | bash -
uses: open-contracting/.github/.github/workflows/ci-profile.yml@main
secrets:
private-key: ${{ secrets.PRIVATE_KEY }}
elasticsearch-password: ${{ secrets.ELASTICSEARCH_PASSWORD }}
with:
path-prefix: ''
version: '1.1'
production-refs: '["refs/heads/1.0", "refs/heads/1.1"]'
# Linkcheck is slow for development.
linkcheck: false
# "ResourceWarning: unclosed file <_io.BufferedWriter name='/dev/null'>"
pytest-options: -W ignore::ResourceWarning
24 changes: 8 additions & 16 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
name: Lint
on: [push, pull_request]
env:
BASEDIR: https://raw.githubusercontent.com/open-contracting/standard-maintenance-scripts/main
jobs:
build:
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.10'
cache: pip
cache-dependency-path: '**/requirements*.txt'
- shell: bash
run: curl -s -S --retry 3 $BASEDIR/tests/install.sh | bash -
- shell: bash
run: curl -s -S --retry 3 $BASEDIR/tests/script.sh | bash -
lint:
uses: open-contracting/.github/.github/workflows/lint.yml@main
permissions:
contents: write
secrets:
personal-access-token: ${{ secrets.PAT }}
with:
python-version: '3.10'
14 changes: 2 additions & 12 deletions .github/workflows/shell.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
name: Lint Shell
on: [push, pull_request]
jobs:
build:
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Install shellcheck
run: |
sudo apt update
sudo apt install shellcheck
- run: sudo snap install shfmt
- run: shellcheck $(shfmt -f .)
- run: shfmt -d -i 4 -sr $(shfmt -f .)
lint:
uses: open-contracting/.github/.github/workflows/shell.yml@main
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
/*.pdf
/build
/cache.sqlite
/chromedriver
/chromedriver_linux64.zip
/chromedriver_mac64.zip
/chromedriver_win32.zip
/docs/_static/patched
/src
*.pyc
18 changes: 18 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
ci:
autoupdate_schedule: quarterly
skip: [pip-compile]
default_language_version:
python: python3.10
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.8.6
hooks:
- id: ruff
- id: ruff-format
- repo: https://github.com/astral-sh/uv-pre-commit
rev: 0.5.14
hooks:
- id: pip-compile
name: pip-compile common-requirements.in
args: [common-requirements.in, -o, common-requirements.txt]
files: ^common-requirements\.(in|txt)$
1 change: 1 addition & 0 deletions .python-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.10
3 changes: 1 addition & 2 deletions common-requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ linkify-it-py
myst-parser
ocds-babel
Sphinx
-e git+https://github.com/open-contracting/standard_theme.git@open_contracting#egg=standard_theme
git+https://github.com/open-contracting/standard_theme.git@open_contracting#egg=standard_theme

# Profile
ocdsextensionregistry
Expand All @@ -19,5 +19,4 @@ selenium

# Development
click
pip-tools
sphinx-autobuild
Loading

0 comments on commit 329d32d

Please sign in to comment.