Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: Upper-bound cython to work around pyyaml/docker-compose shenanigans #3656

Closed
wants to merge 3 commits into from
Closed

WIP: Upper-bound cython to work around pyyaml/docker-compose shenanigans #3656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ba0b24
Upper-bound cython to work around pyyaml/docker-compose shenanigans
nemacysts Jul 19, 2023
ec1f704
maybe constraints?
nemacysts Jul 19, 2023
611d3aa
more passenv
nemacysts Jul 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

# Set ENV to 'YELP' if FQDN ends in '.yelpcorp.com'
# Otherwise, set ENV to the FQDN
export PIP_CONSTRAINTS ?= ./constraints.txt

ifeq ($(findstring .yelpcorp.com,$(shell hostname -f)), .yelpcorp.com)
PAASTA_ENV ?= YELP
Expand Down
1 change: 1 addition & 0 deletions requirements-minimal.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ certifi
choice >= 0.1
cookiecutter >= 1.4.0
croniter
cython < 3.0.0 # to work around some pyyaml/docker-compose shenanigans in GHA
# Don't update this unless you have confirmed the client works with
# the Docker version deployed on PaaSTA servers
docker-py >= 1.2.3
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ choice==0.1
click==6.6
cookiecutter==1.4.0
croniter==1.3.4
cython==0.29.36
decorator==4.1.2
docker-py==1.2.3
docutils==0.12
Expand Down
12 changes: 7 additions & 5 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ docker_compose_version = 1.26.2
# running outside of Yelp.
indexserver = https://pypi.yelpcorp.com/simple
basepython = python3.7
passenv = SSH_AUTH_SOCK
passenv = SSH_AUTH_SOCK PIP_CONSTRAINTS
setenv =
TZ = UTC
PIP_INDEX_URL = {env:PIP_INDEX_URL:https://pypi.yelpcorp.com/simple}
Expand All @@ -28,7 +28,7 @@ commands =

[testenv:dev-api]
envdir = .tox/py37-linux/
passenv = PAASTA_TEST_CLUSTER KUBECONFIG PAASTA_SYSTEM_CONFIG_DIR
passenv = PAASTA_TEST_CLUSTER KUBECONFIG PAASTA_SYSTEM_CONFIG_DIR PIP_CONSTRAINTS
deps =
--requirement={toxinidir}/requirements.txt
--requirement={toxinidir}/requirements-dev.txt
Expand All @@ -39,7 +39,7 @@ commands =

[testenv:playground-api]
envdir = .tox/py37-linux/
passenv = PAASTA_TEST_CLUSTER KUBECONFIG PAASTA_SYSTEM_CONFIG_DIR PAASTA_API_SOA_DIR USER
passenv = PAASTA_TEST_CLUSTER KUBECONFIG PAASTA_SYSTEM_CONFIG_DIR PAASTA_API_SOA_DIR USER PIP_CONSTRAINTS
setenv =
KUBECONFIG = ./k8s_itests/kubeconfig
PAASTA_TEST_CLUSTER = kind-{env:USER}-k8s-test
Expand Down Expand Up @@ -90,6 +90,7 @@ basepython = python3.7
whitelist_externals = bash
deps =
urllib3<2.0
cython<3.0.0
docker-compose=={[tox]docker_compose_version}
setenv =
passenv =
Expand All @@ -105,6 +106,7 @@ passenv =
DOCKER_TLS_VERIFY
DOCKER_HOST
DOCKER_CERT_PATH
PIP_CONSTRAINTS
changedir=k8s_itests/
commands =
# Build /etc/paasta used by docker-compose
Expand All @@ -117,7 +119,7 @@ commands =

[testenv:example_cluster]
changedir=example_cluster/
passenv = DOCKER_TLS_VERIFY DOCKER_HOST DOCKER_CERT_PATH
passenv = DOCKER_TLS_VERIFY DOCKER_HOST DOCKER_CERT_PATH PIP_CONSTRAINTS
deps =
docker-compose=={[tox]docker_compose_version}
commands =
Expand All @@ -140,7 +142,7 @@ basepython = python3.7
setenv =
PAASTA_SYSTEM_CONFIG_DIR = {toxinidir}/general_itests/fake_etc_paasta
changedir=general_itests/
passenv = DOCKER_TLS_VERIFY DOCKER_HOST DOCKER_CERT_PATH
passenv = DOCKER_TLS_VERIFY DOCKER_HOST DOCKER_CERT_PATH PIP_CONSTRAINTS
deps =
{[testenv]deps}
behave==1.2.5
Expand Down
Loading