From 8d0bfc4e03ff120ae4aec528d7c534b642b48108 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 24 Sep 2023 22:34:13 +1000 Subject: [PATCH] Move and delete files for merging into main repository --- .editorconfig | 18 ----------------- .github/mergify.yml | 11 ---------- .github/renovate.json | 14 ------------- .github/workflows/lint.yml | 20 ------------------- .../workflows/{build.sh => wheels-build.sh} | 0 .gitignore | 7 ------- .gitmodules | 5 +---- .pre-commit-config.yaml | 10 ---------- Pillow | 1 - update-pillow-tag.sh | 18 ----------------- README.rst => wheels/README.rst | 0 config.sh => wheels/config.sh | 0 .../dependency_licenses}/BROTLI.txt | 0 .../dependency_licenses}/BZIP2.txt | 0 .../dependency_licenses}/FREETYPE2.txt | 0 .../dependency_licenses}/HARFBUZZ.txt | 0 .../dependency_licenses}/LCMS2.txt | 0 .../dependency_licenses}/LIBJPEG.txt | 0 .../dependency_licenses}/LIBLZMA.txt | 0 .../dependency_licenses}/LIBPNG.txt | 0 .../dependency_licenses}/LIBTIFF.txt | 0 .../dependency_licenses}/LIBWEBP.txt | 0 .../dependency_licenses}/OPENJPEG.txt | 0 .../dependency_licenses}/RAQM.txt | 0 .../dependency_licenses}/XAU.txt | 0 .../dependency_licenses}/XCB.txt | 0 .../dependency_licenses}/XDMCP.txt | 0 .../dependency_licenses}/ZLIB.txt | 0 multibuild => wheels/multibuild | 0 29 files changed, 1 insertion(+), 103 deletions(-) delete mode 100644 .editorconfig delete mode 100644 .github/mergify.yml delete mode 100644 .github/renovate.json delete mode 100644 .github/workflows/lint.yml rename .github/workflows/{build.sh => wheels-build.sh} (100%) delete mode 100644 .gitignore delete mode 100644 .pre-commit-config.yaml delete mode 160000 Pillow delete mode 100755 update-pillow-tag.sh rename README.rst => wheels/README.rst (100%) rename config.sh => wheels/config.sh (100%) rename {dependency_licenses => wheels/dependency_licenses}/BROTLI.txt (100%) rename {dependency_licenses => wheels/dependency_licenses}/BZIP2.txt (100%) rename {dependency_licenses => wheels/dependency_licenses}/FREETYPE2.txt (100%) rename {dependency_licenses => wheels/dependency_licenses}/HARFBUZZ.txt (100%) rename {dependency_licenses => wheels/dependency_licenses}/LCMS2.txt (100%) rename {dependency_licenses => wheels/dependency_licenses}/LIBJPEG.txt (100%) rename {dependency_licenses => wheels/dependency_licenses}/LIBLZMA.txt (100%) rename {dependency_licenses => wheels/dependency_licenses}/LIBPNG.txt (100%) rename {dependency_licenses => wheels/dependency_licenses}/LIBTIFF.txt (100%) rename {dependency_licenses => wheels/dependency_licenses}/LIBWEBP.txt (100%) rename {dependency_licenses => wheels/dependency_licenses}/OPENJPEG.txt (100%) rename {dependency_licenses => wheels/dependency_licenses}/RAQM.txt (100%) rename {dependency_licenses => wheels/dependency_licenses}/XAU.txt (100%) rename {dependency_licenses => wheels/dependency_licenses}/XCB.txt (100%) rename {dependency_licenses => wheels/dependency_licenses}/XDMCP.txt (100%) rename {dependency_licenses => wheels/dependency_licenses}/ZLIB.txt (100%) rename multibuild => wheels/multibuild (100%) diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index 0248df6d0..000000000 --- a/.editorconfig +++ /dev/null @@ -1,18 +0,0 @@ -# Top-most EditorConfig file -root = true - -[*] -# Unix-style newlines with a newline ending every file -end_of_line = lf -insert_final_newline = true -charset = utf-8 - -# Four-space indentation -indent_size = 4 -indent_style = space - -trim_trailing_whitespace = true - -[*.yml] -# Two-space indentation -indent_size = 2 diff --git a/.github/mergify.yml b/.github/mergify.yml deleted file mode 100644 index ab2c5895f..000000000 --- a/.github/mergify.yml +++ /dev/null @@ -1,11 +0,0 @@ -pull_request_rules: - - name: Automatic merge - conditions: - - "#approved-reviews-by>=1" - - label=automerge - - status-success=Lint - - status-success=Travis CI - Pull Request - - status-success=Wheels Successful - actions: - merge: - method: merge diff --git a/.github/renovate.json b/.github/renovate.json deleted file mode 100644 index 812c34550..000000000 --- a/.github/renovate.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "config:base" - ], - "packageRules": [ - { - "groupName": "github-actions", - "matchManagers": ["github-actions"], - "separateMajorMinor": "false" - } - ], - "schedule": ["on the 4th day of the month"] -} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml deleted file mode 100644 index d1be3538f..000000000 --- a/.github/workflows/lint.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Lint - -on: [push, pull_request, workflow_dispatch] - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - lint: - runs-on: ubuntu-latest - - name: Lint - - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 - with: - python-version: "3.x" - - uses: pre-commit/action@v3.0.0 diff --git a/.github/workflows/build.sh b/.github/workflows/wheels-build.sh similarity index 100% rename from .github/workflows/build.sh rename to .github/workflows/wheels-build.sh diff --git a/.gitignore b/.gitignore deleted file mode 100644 index accfdd59c..000000000 --- a/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -*.pyc -*.swp -*~ -.idea -build -downloads -working diff --git a/.gitmodules b/.gitmodules index f3b08ad44..0c15f2bba 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "Pillow"] - path = Pillow - url = https://github.com/python-Pillow/Pillow.git [submodule "multibuild"] - path = multibuild + path = wheels/multibuild url = https://github.com/multi-build/multibuild.git diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml deleted file mode 100644 index d88b9bf78..000000000 --- a/.pre-commit-config.yaml +++ /dev/null @@ -1,10 +0,0 @@ -repos: - - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 - hooks: - - id: check-merge-conflict - - id: check-json - - id: check-yaml - -ci: - autoupdate_schedule: quarterly diff --git a/Pillow b/Pillow deleted file mode 160000 index e34d346f1..000000000 --- a/Pillow +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e34d346f10c0b1c814661e662a3e0c1ef084cf1c diff --git a/update-pillow-tag.sh b/update-pillow-tag.sh deleted file mode 100755 index efad3766d..000000000 --- a/update-pillow-tag.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash - -set -e # exit on error - -if [ $# -eq 0 ]; then - echo "Usage: update-pillow-tag.sh [[release tag]]" - exit -fi - -git checkout main -git submodule update --init Pillow -cd Pillow -git fetch --all -git checkout $1 -cd .. -git commit -m "Pillow -> $1" Pillow -git tag $1 -git push origin $1 diff --git a/README.rst b/wheels/README.rst similarity index 100% rename from README.rst rename to wheels/README.rst diff --git a/config.sh b/wheels/config.sh similarity index 100% rename from config.sh rename to wheels/config.sh diff --git a/dependency_licenses/BROTLI.txt b/wheels/dependency_licenses/BROTLI.txt similarity index 100% rename from dependency_licenses/BROTLI.txt rename to wheels/dependency_licenses/BROTLI.txt diff --git a/dependency_licenses/BZIP2.txt b/wheels/dependency_licenses/BZIP2.txt similarity index 100% rename from dependency_licenses/BZIP2.txt rename to wheels/dependency_licenses/BZIP2.txt diff --git a/dependency_licenses/FREETYPE2.txt b/wheels/dependency_licenses/FREETYPE2.txt similarity index 100% rename from dependency_licenses/FREETYPE2.txt rename to wheels/dependency_licenses/FREETYPE2.txt diff --git a/dependency_licenses/HARFBUZZ.txt b/wheels/dependency_licenses/HARFBUZZ.txt similarity index 100% rename from dependency_licenses/HARFBUZZ.txt rename to wheels/dependency_licenses/HARFBUZZ.txt diff --git a/dependency_licenses/LCMS2.txt b/wheels/dependency_licenses/LCMS2.txt similarity index 100% rename from dependency_licenses/LCMS2.txt rename to wheels/dependency_licenses/LCMS2.txt diff --git a/dependency_licenses/LIBJPEG.txt b/wheels/dependency_licenses/LIBJPEG.txt similarity index 100% rename from dependency_licenses/LIBJPEG.txt rename to wheels/dependency_licenses/LIBJPEG.txt diff --git a/dependency_licenses/LIBLZMA.txt b/wheels/dependency_licenses/LIBLZMA.txt similarity index 100% rename from dependency_licenses/LIBLZMA.txt rename to wheels/dependency_licenses/LIBLZMA.txt diff --git a/dependency_licenses/LIBPNG.txt b/wheels/dependency_licenses/LIBPNG.txt similarity index 100% rename from dependency_licenses/LIBPNG.txt rename to wheels/dependency_licenses/LIBPNG.txt diff --git a/dependency_licenses/LIBTIFF.txt b/wheels/dependency_licenses/LIBTIFF.txt similarity index 100% rename from dependency_licenses/LIBTIFF.txt rename to wheels/dependency_licenses/LIBTIFF.txt diff --git a/dependency_licenses/LIBWEBP.txt b/wheels/dependency_licenses/LIBWEBP.txt similarity index 100% rename from dependency_licenses/LIBWEBP.txt rename to wheels/dependency_licenses/LIBWEBP.txt diff --git a/dependency_licenses/OPENJPEG.txt b/wheels/dependency_licenses/OPENJPEG.txt similarity index 100% rename from dependency_licenses/OPENJPEG.txt rename to wheels/dependency_licenses/OPENJPEG.txt diff --git a/dependency_licenses/RAQM.txt b/wheels/dependency_licenses/RAQM.txt similarity index 100% rename from dependency_licenses/RAQM.txt rename to wheels/dependency_licenses/RAQM.txt diff --git a/dependency_licenses/XAU.txt b/wheels/dependency_licenses/XAU.txt similarity index 100% rename from dependency_licenses/XAU.txt rename to wheels/dependency_licenses/XAU.txt diff --git a/dependency_licenses/XCB.txt b/wheels/dependency_licenses/XCB.txt similarity index 100% rename from dependency_licenses/XCB.txt rename to wheels/dependency_licenses/XCB.txt diff --git a/dependency_licenses/XDMCP.txt b/wheels/dependency_licenses/XDMCP.txt similarity index 100% rename from dependency_licenses/XDMCP.txt rename to wheels/dependency_licenses/XDMCP.txt diff --git a/dependency_licenses/ZLIB.txt b/wheels/dependency_licenses/ZLIB.txt similarity index 100% rename from dependency_licenses/ZLIB.txt rename to wheels/dependency_licenses/ZLIB.txt diff --git a/multibuild b/wheels/multibuild similarity index 100% rename from multibuild rename to wheels/multibuild