Allow the usage of gunicorn.conf.py config file in gunicorn applications #684
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hrnciar
changed the title
|
[test-all] |
hrnciar
changed the title
|
[test-all] |
hrnciar
force-pushed
the
gunicorn-defaults
branch
2 times, most recently
from
bf832ff
to
5f8a345
Compare
|
[test-all] |
hrnciar
force-pushed
the
gunicorn-defaults
branch
from
5f8a345
to
41cba37
Compare
|
[test-all] |
|
[test] |
hrnciar
force-pushed
the
gunicorn-defaults
branch
from
41cba37
to
a4371c6
Compare
|
[test] |
hrnciar
force-pushed
the
gunicorn-defaults
branch
from
a4371c6
to
1c03553
Compare
|
[test] |
1 similar comment
|
[test] |
hrnciar
force-pushed
the
gunicorn-defaults
branch
from
6f79ce0
to
1c03553
Compare
|
[test] |
1 similar comment
|
[test] |
hrnciar
force-pushed
the
gunicorn-defaults
branch
from
db6436c
to
d212002
Compare
|
[test] |
hrnciar
force-pushed
the
gunicorn-defaults
branch
from
d212002
to
3e78560
Compare
|
[test-all] |
befeleme
reviewed
Jun 26, 2024
There was a problem hiding this comment.
The diff looks good to me, in the tests you can see the configfile is used.
Should this test be only added to those running on Python 3? I see there's a test failure on the newly added tests in RHEL8-2.7 container but not sure how it is related.
I assume openshift tests are expected to fail outside of the internal network?
src/s2i/bin/run
Outdated
| if is_gunicorn_installed && [[ -f "gunicorn.conf.py" ]]; then | ||
| ret=$(python -c 'import gunicorn | ||
| ver = gunicorn.version_info | ||
| print(0) if ver[0]>=21 or (ver[0] == 20 and ver[1] >= 1) else print(1)') |
There was a problem hiding this comment.
This can be a little bit shorter:
Suggested change
| print(0) if ver[0]>=21 or (ver[0] == 20 and ver[1] >= 1) else print(1)') | |
| print(0 if ver[0]>=21 or (ver[0] == 20 and ver[1] >= 1) else 1)') |
test/run
Outdated
| @@ -6,7 +6,7 @@ | |||
| # IMAGE_NAME specifies a name of the candidate image used for testing. | |||
| # The image has to be available before this script is executed. | |||
| # | |||
| declare -a COMMON_WEB_APPS=({gunicorn-config-different-port,gunicorn-different-port,django-different-port,standalone,setup,setup-requirements,django,numpy,app-home,locale,pipenv,pipenv-and-micropipenv-should-fail,app-module,pyuwsgi-pipenv{% if spec.version.startswith("3.") %},micropipenv,standalone-custom-pypi-index{% endif %}}-test-app) | |||
| declare -a COMMON_WEB_APPS=({gunicorn-config-different-port,gunicorn-different-port,gunicorn-python-configfile-different-port,django-different-port,standalone,setup,setup-requirements,django,numpy,app-home,locale,pipenv,pipenv-and-micropipenv-should-fail,app-module,pyuwsgi-pipenv{% if spec.version.startswith("3.") %},micropipenv,standalone-custom-pypi-index{% endif %}}-test-app) | |||
There was a problem hiding this comment.
Because the test requires gunicorn 20.1+ it will never work with Python 2 because the last gunicorn compatible with Python 2 is version 19.
Therefore we need to move the test to the section for python-3-only.
Suggested change
| declare -a COMMON_WEB_APPS=({gunicorn-config-different-port,gunicorn-different-port,gunicorn-python-configfile-different-port,django-different-port,standalone,setup,setup-requirements,django,numpy,app-home,locale,pipenv,pipenv-and-micropipenv-should-fail,app-module,pyuwsgi-pipenv{% if spec.version.startswith("3.") %},micropipenv,standalone-custom-pypi-index{% endif %}}-test-app) | |
| declare -a COMMON_WEB_APPS=({gunicorn-config-different-port,gunicorn-different-port,django-different-port,standalone,setup,setup-requirements,django,numpy,app-home,locale,pipenv,pipenv-and-micropipenv-should-fail,app-module,pyuwsgi-pipenv{% if spec.version.startswith("3.") %},micropipenv,standalone-custom-pypi-index,gunicorn-python-configfile-different-port{% endif %}}-test-app) |
hrnciar
force-pushed
the
gunicorn-defaults
branch
from
3e78560
to
443f6fe
Compare
hrnciar
changed the title
|
[test] |
1 similar comment
|
[test] |
befeleme
reviewed
Jun 27, 2024
test/run
Outdated
| @@ -6,7 +6,7 @@ | |||
| # IMAGE_NAME specifies a name of the candidate image used for testing. | |||
| # The image has to be available before this script is executed. | |||
| # | |||
| declare -a COMMON_WEB_APPS=({gunicorn-config-different-port,gunicorn-different-port,django-different-port,standalone,setup,setup-requirements,django,numpy,app-home,locale,pipenv,pipenv-and-micropipenv-should-fail,app-module,pyuwsgi-pipenv{% if spec.version.startswith("3.") %},micropipenv,standalone-custom-pypi-index{% endif %}}-test-app) | |||
| declare -a COMMON_WEB_APPS=({gunicorn-config-different-port,gunicorn-different-port,gunicorn-python-configfile-different-port,django-different-port,standalone,setup,setup-requirements,django,numpy,app-home,locale,pipenv,pipenv-and-micropipenv-should-fail,app-module,pyuwsgi-pipenv{% if spec.version.startswith("3.") %},micropipenv,standalone-custom-pypi-index,gunicorn-python-configfile-different-port{% endif %}}-test-app) | |||
There was a problem hiding this comment.
The first occurrence of gunicorn-python-configfile-different-port should be removed from here.
hrnciar
force-pushed
the
gunicorn-defaults
branch
from
443f6fe
to
3751b24
Compare
|
[test] |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.