[7.x] Change 'make.sh release' to 'make.sh assemble'

Co-authored-by: Seth Michael Larson <seth.larson@elastic.co>
This commit is contained in:
github-actions[bot]
2020-11-10 13:45:05 -06:00
committed by GitHub
parent 7fb43ae64d
commit 21f25419eb
4 changed files with 15 additions and 7 deletions
+8 -2
View File
@@ -2,9 +2,15 @@ ARG PYTHON_VERSION=3.8
FROM python:${PYTHON_VERSION} FROM python:${PYTHON_VERSION}
WORKDIR /code/elasticsearch-py WORKDIR /code/elasticsearch-py
COPY . . COPY dev-requirements.txt .
RUN python -m pip install \ RUN python -m pip install \
-U --no-cache-dir \
--disable-pip-version-check \
pip \
&& python -m pip install \
--no-cache-dir \ --no-cache-dir \
--disable-pip-version-check \ --disable-pip-version-check \
-e . \
-r dev-requirements.txt -r dev-requirements.txt
COPY . .
RUN python -m pip install -e .
+5 -3
View File
@@ -5,10 +5,12 @@ set -eo pipefail
BASE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" BASE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
BASE_DIR="$( dirname "$BASE_DIR" )" BASE_DIR="$( dirname "$BASE_DIR" )"
if [[ "$1" == "release" ]]; then if [[ "$1" == "assemble" ]]; then
python $BASE_DIR/utils/build-dists.py $2
mkdir -p $BASE_DIR/.ci/output mkdir -p $BASE_DIR/.ci/output
cp $BASE_DIR/dist/* $BASE_DIR/.ci/output/ docker build . --tag elastic/elasticsearch-py -f .ci/Dockerfile
docker run --rm -it -v $BASE_DIR/.ci/output:/code/elasticsearch-py/dist \
elastic/elasticsearch-py \
python /code/elasticsearch-py/utils/build-dists.py $2
exit 0 exit 0
fi fi
-1
View File
@@ -1,7 +1,6 @@
docs docs
example example
venv venv
.git
.tox .tox
.nox .nox
.*_cache .*_cache
+2 -1
View File
@@ -161,7 +161,7 @@ def test_dist(dist):
def main(): def main():
run("git", "checkout", "--", "setup.py", "elasticsearch/") run("git", "checkout", "--", "setup.py", "elasticsearch/")
run("rm", "-rf", "build/", "dist/", "*.egg-info", ".eggs") run("rm", "-rf", "build/", "dist/*", "*.egg-info", ".eggs")
# Grab the major version to be used as a suffix. # Grab the major version to be used as a suffix.
version_path = os.path.join(base_dir, "elasticsearch/_version.py") version_path = os.path.join(base_dir, "elasticsearch/_version.py")
@@ -258,6 +258,7 @@ def main():
assert len(dists) == 4 assert len(dists) == 4
for dist in dists: for dist in dists:
test_dist(os.path.join(base_dir, "dist", dist)) test_dist(os.path.join(base_dir, "dist", dist))
os.system("chmod a+w dist/*")
# After this run 'python -m twine upload dist/*' # After this run 'python -m twine upload dist/*'
print( print(