Fix: Remove unneeded directory "schema" (#5753)

* Remove unneeded directory "schema" * add schema to excluded packages * sync build linux & mac * fix make pr * exclude schema from setup.py + PYTHONPATH for make schema * run schema with -m --------- Co-authored-by: Lucas <[email protected]>
aws · Aug 30, 2023 · 65268b9 · 65268b9
1 parent a2decd0
commit 65268b9
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -52,8 +52,8 @@ black-check:
 format: black
 	ruff samcli --fix
 
-schema: 
-	python schema/make_schema.py
+schema:
+	python -m schema.make_schema
 
 # Verifications to run before sending a pull request
 pr: init dev schema black-check

diff --git a/installer/pyinstaller/build-linux.sh b/installer/pyinstaller/build-linux.sh
@@ -54,6 +54,7 @@ rm -rf ./output/aws-sam-cli-src/tests
 rm -rf ./output/aws-sam-cli-src/designs
 rm -rf ./output/aws-sam-cli-src/docs
 rm -rf ./output/aws-sam-cli-src/media
+rm -rf ./output/aws-sam-cli-src/schema
 rm -rf ./output/aws-sam-cli-src/Make.ps1
 rm -rf ./output/aws-sam-cli-src/CODEOWNERS
 rm -rf ./output/aws-sam-cli-src/CODE_OF_CONDUCT.md

diff --git a/installer/pyinstaller/build-mac.sh b/installer/pyinstaller/build-mac.sh
@@ -71,8 +71,21 @@ echo "Copying Source"
 cp -r ../[!.]* ./src
 cp -r ./src/* ./output/aws-sam-cli-src
 
-echo "Removing CI Scripts"
+echo "Removing CI Scripts and other files/direcories not needed"
 rm -vf ./output/aws-sam-cli-src/appveyor*.yml
+rm -rf ./output/aws-sam-cli-src/tests
+rm -rf ./output/aws-sam-cli-src/designs
+rm -rf ./output/aws-sam-cli-src/docs
+rm -rf ./output/aws-sam-cli-src/media
+rm -rf ./output/aws-sam-cli-src/schema
+rm -rf ./output/aws-sam-cli-src/Make.ps1
+rm -rf ./output/aws-sam-cli-src/CODEOWNERS
+rm -rf ./output/aws-sam-cli-src/CODE_OF_CONDUCT.md
+rm -rf ./output/aws-sam-cli-src/CONTRIBUTING.md
+rm -rf ./output/aws-sam-cli-src/DESIGN.md
+rm -rf ./output/aws-sam-cli-src/Makefile
+rm -rf ./output/aws-sam-cli-src/mypy.ini
+rm -rf ./output/aws-sam-cli-src/pytest.ini
 
 echo "Installing Python"
 curl "https://www.python.org/ftp/python/${python_version}/Python-${python_version}.tgz" --output python.tgz

diff --git a/setup.py b/setup.py
@@ -51,7 +51,7 @@ def read_version():
     author_email="[email protected]",
     url="https://github.com/aws/aws-sam-cli",
     license="Apache License 2.0",
-    packages=find_packages(exclude=["tests.*", "tests", "installer.*", "installer"]),
+    packages=find_packages(exclude=["tests.*", "tests", "installer.*", "installer", "schema.*", "schema"]),
     keywords="AWS SAM CLI",
     # Support Python 3.7 or greater
     python_requires=">=3.7, <=4.0, !=4.0",