diff --git a/.circleci/config.yml b/.circleci/config.yml index 98d371f3..3cc84493 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ version: 2 jobs: generate-bindings: docker: - - image: circleci/openjdk:8u171-jdk-node-browsers + - image: cimg/openjdk:11.0.10-node steps: - checkout @@ -27,7 +27,7 @@ jobs: py27: docker: - - image: circleci/python:2.7.15 + - image: cimg/python:2.7.18 steps: - checkout @@ -62,7 +62,7 @@ jobs: py3: docker: - - image: circleci/python:3.6.5 + - image: cimg/python:3.6.15 steps: - checkout @@ -97,7 +97,7 @@ jobs: mypy27: docker: - - image: circleci/python:3.6.5 + - image: cimg/python:3.6.15 steps: - checkout @@ -129,7 +129,7 @@ jobs: mypy3: docker: - - image: circleci/python:3.6.5 + - image: cimg/python:3.6.15 steps: - checkout @@ -161,7 +161,7 @@ jobs: lint: docker: - - image: circleci/python:3.6.5 + - image: cimg/python:3.6.15 steps: - checkout @@ -193,15 +193,14 @@ jobs: publish-wheel: docker: - - image: circleci/python:3.6.5 + - image: cimg/python:3.6.15 steps: - checkout - deploy: command: | pip install --user setuptools wheel twine python setup.py sdist bdist_wheel --universal - ~/.local/bin/twine upload dist/* - + ~/.local/bin/twine upload --repository-url https://upload.pypi.org/legacy/ -u $PYPI_USERNAME -p $PYPI_PASSWORD dist/* workflows: version: 2 build: diff --git a/scripts/download_conjure_python.sh b/scripts/download_conjure_python.sh index df7613de..b67cd236 100755 --- a/scripts/download_conjure_python.sh +++ b/scripts/download_conjure_python.sh @@ -7,7 +7,7 @@ ARTIFACT_NAME="conjure-python-${VERSION}" DOWNLOAD_OUTPUT="build/downloads/conjure-python.tgz" mkdir -p build/downloads -curl -L "https://palantir.bintray.com/releases/com/palantir/conjure/python/conjure-python/${VERSION}/${ARTIFACT_NAME}.tgz" -o "$DOWNLOAD_OUTPUT" +curl -L "https://repo1.maven.org/maven2/com/palantir/conjure/python/conjure-python/${VERSION}/${ARTIFACT_NAME}.tgz" -o "$DOWNLOAD_OUTPUT" tar xf "$DOWNLOAD_OUTPUT" -C build rm -rf "build/conjure-python" diff --git a/scripts/download_test_server.sh b/scripts/download_test_server.sh index d2805d5b..3c3fdab3 100755 --- a/scripts/download_test_server.sh +++ b/scripts/download_test_server.sh @@ -24,12 +24,12 @@ function download() { DOWNLOAD_OUTPUT="$RESOURCES_DIR/${API}.conjure.json" ARTIFACT_NAME="${API}-${VERSION}.conjure.json" -out=$(download "https://palantir.bintray.com/releases/com/palantir/conjure/verification/${API}/${VERSION}/${ARTIFACT_NAME}") +out=$(download "https://repo1.maven.org/maven2/com/palantir/conjure/verification/${API}/${VERSION}/${ARTIFACT_NAME}") cp -f "$out" "$DOWNLOAD_OUTPUT" DOWNLOAD_OUTPUT="$RESOURCES_DIR/${TEST_CASES}.json" ARTIFACT_NAME="${TEST_CASES}-${VERSION}.json" -out=$(download "https://palantir.bintray.com/releases/com/palantir/conjure/verification/${TEST_CASES}/${VERSION}/${ARTIFACT_NAME}") +out=$(download "https://repo1.maven.org/maven2/com/palantir/conjure/verification/${TEST_CASES}/${VERSION}/${ARTIFACT_NAME}") cp -f "$out" "$DOWNLOAD_OUTPUT" @@ -40,6 +40,6 @@ case $(uname -s) in esac ARTIFACT_NAME="${SERVER}-${VERSION}-${TARGET}.tgz" -out=$(download "https://palantir.bintray.com/releases/com/palantir/conjure/verification/${SERVER}/${VERSION}/${ARTIFACT_NAME}") +out=$(download "https://repo1.maven.org/maven2/com/palantir/conjure/verification/${SERVER}/${VERSION}/${ARTIFACT_NAME}") tar xf "$out" -C "$DOWNLOADS_DIR/bin" chmod +x "$DOWNLOADS_DIR/bin/conjure-verification-server"