-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: pyproject.toml to poetry (#65)
* ci: add frappe black to CI (#57) * ci: add frappe black to CI * chore: black * ci: backport testing (#59) * Validate customizations (#41) * fix: * fix: only install customizations for cloud storage * chore: add dependency versions * tests: explicitly install moto with s3 extra * ci: try flit extras-require * test: try this config * fix: fix toml (#62) * refactor: pyproject.toml to poetry * chore: downgrade moto version * chore: rebase to version-15 * ci: coverage report to PR * fix: linting * chore: pytest command * ci: remove old linters, allow from forks * fix: add back setup.py * fix: setup in wrong folder --------- Co-authored-by: Tyler Matteson <[email protected]> Co-authored-by: Tyler Matteson <[email protected]>
- Loading branch information
1 parent
eb92d3b
commit 6332878
Showing
5 changed files
with
881 additions
and
106 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 |
---|---|---|
|
@@ -15,14 +15,10 @@ env: | |
|
||
jobs: | ||
mypy: | ||
needs: [ py_json_merge ] | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v4 | ||
with: | ||
ref: ${{ github.head_ref }} | ||
fetch-depth: 2 | ||
|
||
- name: Setup Python | ||
uses: actions/setup-python@v5 | ||
|
@@ -40,14 +36,10 @@ jobs: | |
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
|
||
black: | ||
needs: [ py_json_merge ] | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v4 | ||
with: | ||
ref: ${{ github.head_ref }} | ||
fetch-depth: 2 | ||
|
||
- name: Setup Python | ||
uses: actions/setup-python@v5 | ||
|
@@ -61,14 +53,10 @@ jobs: | |
run: black --check . | ||
|
||
prettier: | ||
needs: [ py_json_merge ] | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v4 | ||
with: | ||
ref: ${{ github.head_ref }} | ||
fetch-depth: 2 | ||
|
||
- name: Prettify code | ||
uses: rutajdash/[email protected] | ||
|
@@ -82,81 +70,3 @@ jobs: | |
run: | | ||
echo "The following files are not formatted:" | ||
echo "${{steps.prettier-run.outputs.prettier_output}}" >> $GITHUB_OUTPUT | ||
json_diff: | ||
needs: [ py_json_merge ] | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v4 | ||
with: | ||
ref: ${{ github.ref }} | ||
fetch-depth: 2 | ||
|
||
- name: Find JSON changes | ||
id: changed-json | ||
uses: tj-actions/changed-files@v43 | ||
with: | ||
files: | | ||
**/*.json | ||
include_all_old_new_renamed_files: true | ||
|
||
- name: Copy head paths files | ||
run: | | ||
mkdir head | ||
touch head/acmr.txt | ||
for file in ${{ steps.changed-json.outputs.added_files }}; do | ||
echo "A,head/${file}" >> head/acmr.txt | ||
cp --parents $file head/ | ||
done | ||
for file in ${{ steps.changed-json.outputs.copied_files }}; do | ||
echo "C,head/${file}" >> head/acmr.txt | ||
cp --parents $file head/ | ||
done | ||
for file in ${{ steps.changed-json.outputs.modified_files }}; do | ||
echo "M,head/${file}" >> head/acmr.txt | ||
cp --parents $file head/ | ||
done | ||
for file in ${{ steps.changed-json.outputs.renamed_files }}; do | ||
echo "R,head/${file}" >> head/acmr.txt | ||
cp --parents $file head/ | ||
done | ||
- name: Checkout base | ||
run: git checkout $(git --no-pager log --oneline -n 2 | awk 'NR==2 {print $1}') | ||
|
||
- name: Copy base paths | ||
run: | | ||
mkdir base | ||
touch base/mrd.txt | ||
for file in ${{ steps.changed-json.outputs.modified_files }}; do | ||
echo "M,${file}" >> base/mrd.txt | ||
done | ||
for file in ${{ steps.changed-json.outputs.all_old_new_renamed_files }}; do | ||
echo "R,${file}" >> base/mrd.txt | ||
done | ||
for file in ${{ steps.changed-json.outputs.deleted_files }}; do | ||
echo "D,${file}" >> base/mrd.txt | ||
done | ||
py_json_merge: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/checkout@v4 | ||
|
||
- name: Fetch validator | ||
run: git clone --depth 1 https://gist.github.com/f1bf2c11f78331b2417189c385022c28.git validate_json | ||
|
||
- name: Validate JSON | ||
run: python3 validate_json/validate_json.py ./cloud_storage/cloud_storage/ | ||
|
||
- name: Compile | ||
run: python3 -m compileall -q ./ | ||
|
||
- name: Check merge | ||
run: | | ||
if grep -lr --exclude-dir=node_modules "^<<<<<<< " "${GITHUB_WORKSPACE}" | ||
then echo "Found merge conflicts" | ||
exit 1 | ||
fi |
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
Oops, something went wrong.