From 4411dac9b5ad3513da263b6c9c6b0cdbfec45f31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Mon, 18 Nov 2024 08:51:07 +0100 Subject: [PATCH] End of support of version 1.15 --- .github/renovate.json5 | 2 +- .github/workflows/rebuild-115.yaml | 74 ------------------------------ .pre-commit-config.yaml | 11 ----- SECURITY.md | 5 +- 4 files changed, 2 insertions(+), 90 deletions(-) delete mode 100644 .github/workflows/rebuild-115.yaml diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 9615dc076..742acd134 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -12,7 +12,7 @@ automerge: true, schedule: 'after 5pm on the first day of the month', }, - baseBranches: ['1.15', '1.17', '1.18', '1.19', 'master'], + baseBranches: ['1.17', '1.18', '1.19', 'master'], 'pre-commit': { enabled: true }, regexManagers: [ { diff --git a/.github/workflows/rebuild-115.yaml b/.github/workflows/rebuild-115.yaml deleted file mode 100644 index 86be19952..000000000 --- a/.github/workflows/rebuild-115.yaml +++ /dev/null @@ -1,74 +0,0 @@ -name: Rebuild 1.15 - -on: - schedule: - - cron: 30 2 * * * - -jobs: - rebuild: - runs-on: ubuntu-22.04 - name: Rebuild 1.15 - timeout-minutes: 20 - - strategy: - fail-fast: false - matrix: - branch: - - '1.15' - - env: - REDIS_URL: redis://localhost:6379 - PATH: /bin:/usr/bin:/usr/local/bin:/home/runner/.local/bin - SUMMON_PROVIDER: /usr/local/bin/gopass - - steps: - - run: docker system prune --all --force - - uses: actions/checkout@v4 - with: - ref: ${{ matrix.branch }} - - - uses: camptocamp/initialise-gopass-summon-action@v2 - with: - ci-gpg-private-key: ${{secrets.CI_GPG_PRIVATE_KEY}} - github-gopass-ci-token: ${{secrets.GOPASS_CI_GITHUB_TOKEN}} - patterns: pypi docker - if: github.repository == 'camptocamp/tilecloud-chain' - - - run: echo "${HOME}/.local/bin" >> ${GITHUB_PATH} - - run: python3 -m pip install --user --requirement=ci/requirements.txt - - - name: Checks - run: c2cciutils-checks - - - run: touch tilecloud_chain/OpenLayers.js - - - name: Build - run: | - python setup.py --long-description > PYPI.md - docker build --tag=camptocamp/tilecloud-chain:tests --target=tests . - docker build --tag=camptocamp/tilecloud-chain . - git --no-pager diff --check `git log --oneline | tail -1 | cut --fields=1 --delimiter=' '` - - - name: Test - run: | - docker-compose up -d - - # Wait for DB to be up - while ! docker-compose exec -T test psql -h db -p 5432 -U postgresql -v ON_ERROR_STOP=1 -c "SELECT 1" -d tests - do - echo "Waiting for DB to be UP" - sleep 1 - done - - # nosetests is for version 1.14 - docker-compose exec -T test pytest || docker-compose exec -T test python setup.py nosetests --logging-filter=tilecloud,tilecloud_chain --attr '!'nopy3 - - docker-compose down - - - run: docker-compose logs - if: failure() - - - run: python3 -m pip install --requirement=requirements-publish.txt - - - name: Publish - run: c2cciutils-publish --type=rebuild --branch=${{ matrix.branch }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 13e92e499..21f017d97 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -22,17 +22,6 @@ repos: - id: end-of-file-fixer - id: trailing-whitespace - id: mixed-line-ending - - repo: https://github.com/mheap/json-schema-spell-checker - rev: master - hooks: - - id: json-schema-spell-checker - files: tilecloud_chain/schema.json - args: - - --fields=description - - --ignore-numbers - - --ignore-acronyms - - --en-us - - --spelling=.github/spell-ignore-words.txt - repo: https://github.com/pre-commit/mirrors-prettier rev: v3.0.3 hooks: diff --git a/SECURITY.md b/SECURITY.md index 5c77ff6d2..150619725 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -4,10 +4,7 @@ | Version | Supported Until | | ------- | --------------- | -| <= 1.13 | Unsupported | -| 1.14 | Unsupported | -| 1.15 | Best effort | -| 1.16 | Unsupported | +| <=1.16 | Unsupported | | 1.17 | 23/06/2025 | | 1.18 | Best effort | | 1.19 | Best effort |