Clean build dist scripts and not used files (#427)

Author: liudmylaru

MANIFEST.in

@@ -1,30 +1,9 @@
-include LICENSE.txt
-include THIRD_PARTY_LICENSES.txt
-include ads/common/*.json
-include ads/feature_engineering/*.json
-include ads/templates/*.jinja2
-include ads/common/function/*.yaml
-include ads/common/artifact/*.*
-include ads/model/runtime/schemas/*.yaml
-include ads/jobs/schema/**
-include ads/opctl/index.yaml
-include ads/opctl/operators/**/*.py
-include ads/opctl/docker/**
-include ads/opctl/conda/manifest_template.yaml
-include ads/opctl/conda/config.yaml
-include ads/opctl/config/diagnostics/**/*.yaml
-include ads/opctl/templates/*.jinja2
-include pyproject.toml
-global-exclude tests/**
-global-exclude notebooks/**
-exclude tests/**
-exclude notebooks/**
-exclude build/lib/tests/**
-exclude build/lib/notebooks/**
-exclude benchmark/**
-include ads/ads
-include ads/model/common/*.*
-include ads/operator/**/*.md
-include ads/operator/**/*.yaml
-include ads/operator/**/*.whl
-include ads/operator/**/MLoperator
+# Manifest.in file used by setuptools, which we are not using anymore.
+# Do not add anything to this file, unless revert back to setuptools, which is not recommended. See why here:
+# https://blog.ganssle.io/articles/2021/10/setup-py-deprecated.html.
+
+# Instead flit-core used as backend to build ADS - see section [build-system] in pyproject.toml.
+# For flit-core we can specify files and folders, which needs to be included or excluded in build using
+# [tool.flit.sdist] section of pyproject.toml. See: https://flit.pypa.io/en/latest/pyproject_toml.html#sdist-section
+# If build-system library will change, make changed to list of included/excluded to build files accordingly
+# as it will be suggested by new build-system library.

Makefile

@@ -1,36 +1,3 @@
-RELEASE_BRANCH := release/ads
-DOCS_RELEASE_BRANCH := release
-CLONE_DIR := /tmp/advanced-ds
-DOCS_CLONE_DIR := /tmp/ads-docs
-COPY_INVENTORY := CONTRIBUTING.md LICENSE.txt MANIFEST.in README-development.md README.md SECURITY.md THIRD_PARTY_LICENSES.txt
-
-prepare-release-branch: clean
-	@git checkout master
-	@git clean -xdf
-	@git pull
-	git checkout -b release/$(RELEASE_VERSION)
-
-prepare-ads:
-	@echo "Started advanced-ds clone at $$(date)"
-	@git clone ssh://git@bitbucket.oci.oraclecorp.com:7999/odsc/advanced-ds.git --branch $(RELEASE_BRANCH)  --depth 1 $(CLONE_DIR)
-	@echo "Finished cloning at $$(date)"
-	cp -r $(CLONE_DIR)/ads .
-	$(foreach var,$(COPY_INVENTORY),cp $(CLONE_DIR)/$(var) .;)
-
-prepare-docs:
-	@echo "Started ads_docs clone at $$(date)"
-	@git clone ssh://git@bitbucket.oci.oraclecorp.com:7999/odsc/ads_docs.git --branch $(DOCS_RELEASE_BRANCH)  --depth 1 $(DOCS_CLONE_DIR)
-	@echo "Finished cloning at $$(date)"
-	cp -r $(DOCS_CLONE_DIR)/source docs/ && cp $(DOCS_CLONE_DIR)/requirements.txt docs
-
-prepare: prepare-release-branch prepare-ads prepare-docs
-
-push: clean
-	@bash -c 'if [[ $$(git branch | grep \*) == "* release/$(RELEASE_VERSION)" ]];then echo "Version matching current branch"; else echo "Set proper value to RELEASE_VERSION";exit 1 ; fi'
-	@git add .
-	@git commit -m "Release version: $(RELEASE_VERSION)"
-	@git push --set-upstream origin release/$(RELEASE_VERSION)
-
 dist: clean
 	@python3 -m build
 
@@ -43,5 +10,4 @@ clean:
 	@find ./ -name '*.pyc' -exec rm -f {} \;
 	@find ./ -name 'Thumbs.db' -exec rm -f {} \;
 	@find ./ -name '*~' -exec rm -f {} \;
-	@rm -rf $(CLONE_DIR)
-	@rm -rf $(DOCS_CLONE_DIR)
+	@find ./ -name '.DS_Store' -exec rm -f {} \;

ads/secrets/secrets.py

@@ -324,9 +324,7 @@ def __enter__(self, *args, **kwargs):
                     )
             os.environ.update(export_dict)
             self.exported_keys = list(export_dict.keys())
-            logger.debug(
-                f"Exporting credentials to environment. Keys: {self.exported_keys}"
-            )
+            logger.debug(f"Exporting credentials to environment.")
         else:
             logger.debug(f"Skipping Export credentials to environment.")
 

pyproject.toml

@@ -4,10 +4,10 @@
 ## Check README-development.md and Makefile for instruction how to install or build ADS locally.
 
 [build-system]
-# These are the assumed default build requirements from pip:
-# https://pip.pypa.io/en/stable/reference/pip/#pep-517-and-518-support
 # PEP 517 – A build-system independent format for source trees - https://peps.python.org/pep-0517/
-requires = ["flit-core >= 3.8"]
+# Till recently flit-core library was suggested by pip, so we used it. In future, cosider to change to
+# other, if better, build-backend library.
+requires = ["flit-core >=3.8,<4"]  # should specify <4, so won’t be impacted by changes in the next major version
 build-backend = "flit_core.buildapi"
 
 
@@ -203,3 +203,8 @@ ads = "ads.cli:cli"
 
 [tool.flit.module]
 name = "ads"  # name for local build and import, see https://flit.pypa.io/en/latest/pyproject_toml.html#module-section
+
+[tool.flit.sdist]
+# By default `ads` folder and `LICENSE.txt` file included in sdist. Folders `docs` and `tests` are excluded, as weel as other project files
+# Use this section to include/exclude files and folders. See doc: https://flit.pypa.io/en/latest/pyproject_toml.html#sdist-section
+include = ["THIRD_PARTY_LICENSES.txt"]