From a0418c28551ccd91909bc0514c9e2786ff365e07 Mon Sep 17 00:00:00 2001 From: Robert Schweizer Date: Tue, 16 Jan 2024 03:34:04 +0100 Subject: [PATCH] [python][client] Clean up samples and CI (#17509) * chore: Remove leftover Github action file This was probably added by mistake. A similar file is active in .github/workflows/samples-python-pydantic-v1-petstore.yaml. * chore: Remove leftover VERSION from old python-experimental sample * ci: Stop running Python integration tests in Circle CI These Python clients are all tested with Github Actions already, which is faster, more cleanly separated and only runs on modifications. I'm not cleaning up the pydantic-v1 client, I expect it to be removed soon anyway. * chore: Remove true from sample folder name python-disallowAdditionalPropertiesIfNotPresent-true -> python-disallowAdditionalPropertiesIfNotPresent --- .circleci/config.yml | 15 ----- .../samples-python-client-echo-api.yaml | 2 +- CI/circle_parallel.sh | 18 ------ ...AdditionalPropertiesIfNotPresent-true.yaml | 2 +- samples-python-pydantic-v1-petstore.yaml | 59 ------------------ .../.github/workflows/python.yml | 0 .../.gitignore | 0 .../.gitlab-ci.yml | 0 .../.openapi-generator-ignore | 0 .../.openapi-generator/FILES | 0 .../.openapi-generator/VERSION | 0 .../.travis.yml | 0 .../README.md | 0 .../docs/AuthApi.md | 0 .../docs/Bird.md | 0 .../docs/BodyApi.md | 0 .../docs/Category.md | 0 .../docs/DataQuery.md | 0 .../docs/DefaultValue.md | 0 .../docs/FormApi.md | 0 .../docs/HeaderApi.md | 0 .../docs/NumberPropertiesOnly.md | 0 .../docs/PathApi.md | 0 .../docs/Pet.md | 0 .../docs/Query.md | 0 .../docs/QueryApi.md | 0 .../docs/StringEnumRef.md | 0 .../docs/Tag.md | 0 ...lodeTrueObjectAllOfQueryObjectParameter.md | 0 ...lodeTrueArrayStringQueryObjectParameter.md | 0 .../git_push.sh | 0 .../openapi_client/__init__.py | 0 .../openapi_client/api/__init__.py | 0 .../openapi_client/api/auth_api.py | 0 .../openapi_client/api/body_api.py | 0 .../openapi_client/api/form_api.py | 0 .../openapi_client/api/header_api.py | 0 .../openapi_client/api/path_api.py | 0 .../openapi_client/api/query_api.py | 0 .../openapi_client/api_client.py | 0 .../openapi_client/api_response.py | 0 .../openapi_client/configuration.py | 0 .../openapi_client/exceptions.py | 0 .../openapi_client/models/__init__.py | 0 .../openapi_client/models/bird.py | 0 .../openapi_client/models/category.py | 0 .../openapi_client/models/data_query.py | 0 .../openapi_client/models/default_value.py | 0 .../models/number_properties_only.py | 0 .../openapi_client/models/pet.py | 0 .../openapi_client/models/query.py | 0 .../openapi_client/models/string_enum_ref.py | 0 .../openapi_client/models/tag.py | 0 ...ue_object_all_of_query_object_parameter.py | 0 ...rue_array_string_query_object_parameter.py | 0 .../openapi_client/py.typed | 0 .../openapi_client/rest.py | 0 .../pyproject.toml | 0 .../requirements.txt | 0 .../setup.cfg | 0 .../setup.py | 0 .../test-requirements.txt | 0 .../test/__init__.py | 0 .../test/test_auth_api.py | 0 .../test/test_bird.py | 0 .../test/test_body_api.py | 0 .../test/test_category.py | 0 .../test/test_data_query.py | 0 .../test/test_default_value.py | 0 .../test/test_form_api.py | 0 .../test/test_header_api.py | 0 .../test/test_number_properties_only.py | 0 .../test/test_path_api.py | 0 .../test/test_pet.py | 0 .../test/test_query.py | 0 .../test/test_query_api.py | 0 .../test/test_string_enum_ref.py | 0 .../test/test_tag.py | 0 ...ue_object_all_of_query_object_parameter.py | 0 ...rue_array_string_query_object_parameter.py | 0 .../testfiles/test.gif | Bin .../tests/__init__.py | 0 .../tests/test_manual.py | 0 .../tox.ini | 0 .../.openapi-generator/VERSION | 1 - .../python-aiohttp/dev-requirements.txt | 2 - .../client/petstore/python-aiohttp/pom.xml | 46 -------------- .../petstore/python-aiohttp/test_python3.sh | 31 --------- .../petstore/python/.openapi-generator-ignore | 1 - .../petstore/python/.openapi-generator/FILES | 1 + .../openapi3/client/petstore/python/Makefile | 21 ------- .../petstore/python/dev-requirements.txt | 2 - .../openapi3/client/petstore/python/pom.xml | 46 -------------- .../client/petstore/python/test_python3.sh | 31 --------- 94 files changed, 3 insertions(+), 275 deletions(-) delete mode 100644 samples-python-pydantic-v1-petstore.yaml rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/.github/workflows/python.yml (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/.gitignore (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/.gitlab-ci.yml (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/.openapi-generator-ignore (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/.openapi-generator/FILES (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/.openapi-generator/VERSION (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/.travis.yml (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/README.md (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/docs/AuthApi.md (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/docs/Bird.md (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/docs/BodyApi.md (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/docs/Category.md (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/docs/DataQuery.md (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/docs/DefaultValue.md (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/docs/FormApi.md (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/docs/HeaderApi.md (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/docs/NumberPropertiesOnly.md (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/docs/PathApi.md (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/docs/Pet.md (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/docs/Query.md (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/docs/QueryApi.md (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/docs/StringEnumRef.md (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/docs/Tag.md (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/docs/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.md (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/docs/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.md (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/git_push.sh (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/openapi_client/__init__.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/openapi_client/api/__init__.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/openapi_client/api/auth_api.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/openapi_client/api/body_api.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/openapi_client/api/form_api.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/openapi_client/api/header_api.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/openapi_client/api/path_api.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/openapi_client/api/query_api.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/openapi_client/api_client.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/openapi_client/api_response.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/openapi_client/configuration.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/openapi_client/exceptions.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/openapi_client/models/__init__.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/openapi_client/models/bird.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/openapi_client/models/category.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/openapi_client/models/data_query.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/openapi_client/models/default_value.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/openapi_client/models/number_properties_only.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/openapi_client/models/pet.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/openapi_client/models/query.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/openapi_client/models/string_enum_ref.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/openapi_client/models/tag.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/openapi_client/models/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/openapi_client/models/test_query_style_form_explode_true_array_string_query_object_parameter.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/openapi_client/py.typed (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/openapi_client/rest.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/pyproject.toml (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/requirements.txt (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/setup.cfg (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/setup.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/test-requirements.txt (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/test/__init__.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/test/test_auth_api.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/test/test_bird.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/test/test_body_api.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/test/test_category.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/test/test_data_query.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/test/test_default_value.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/test/test_form_api.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/test/test_header_api.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/test/test_number_properties_only.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/test/test_path_api.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/test/test_pet.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/test/test_query.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/test/test_query_api.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/test/test_string_enum_ref.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/test/test_tag.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/test/test_test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/test/test_test_query_style_form_explode_true_array_string_query_object_parameter.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/testfiles/test.gif (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/tests/__init__.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/tests/test_manual.py (100%) rename samples/client/echo_api/{python-disallowAdditionalPropertiesIfNotPresent-true => python-disallowAdditionalPropertiesIfNotPresent}/tox.ini (100%) delete mode 100644 samples/openapi3/client/3_0_3_unit_test/python-experimental/.openapi-generator/VERSION delete mode 100755 samples/openapi3/client/petstore/python-aiohttp/dev-requirements.txt delete mode 100755 samples/openapi3/client/petstore/python-aiohttp/pom.xml delete mode 100755 samples/openapi3/client/petstore/python-aiohttp/test_python3.sh delete mode 100755 samples/openapi3/client/petstore/python/Makefile delete mode 100755 samples/openapi3/client/petstore/python/dev-requirements.txt delete mode 100755 samples/openapi3/client/petstore/python/pom.xml delete mode 100755 samples/openapi3/client/petstore/python/test_python3.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index 71098116b4..1358ee7865 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -192,20 +192,6 @@ jobs: - checkout - command_build_and_test: nodeNo: "3" - node4: - machine: - image: ubuntu-2004:202201-02 - working_directory: ~/OpenAPITools/openapi-generator - shell: /bin/bash --login - environment: - CIRCLE_ARTIFACTS: /tmp/circleci-artifacts - CIRCLE_TEST_REPORTS: /tmp/circleci-test-results - DOCKER_GENERATOR_IMAGE_NAME: openapitools/openapi-generator - DOCKER_CODEGEN_CLI_IMAGE_NAME: openapitools/openapi-generator-cli - steps: - - checkout - - command_build_and_test: - nodeNo: "4" workflows: version: 2 build: @@ -214,4 +200,3 @@ workflows: - node1 - node2 - node3 - - node4 diff --git a/.github/workflows/samples-python-client-echo-api.yaml b/.github/workflows/samples-python-client-echo-api.yaml index 05ce58c4e4..de1870e311 100644 --- a/.github/workflows/samples-python-client-echo-api.yaml +++ b/.github/workflows/samples-python-client-echo-api.yaml @@ -15,7 +15,7 @@ jobs: sample: # clients - samples/client/echo_api/python - - samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true + - samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent python-version: - "3.7" - "3.8" diff --git a/CI/circle_parallel.sh b/CI/circle_parallel.sh index 8b6a40983a..8ee9dbeb2f 100755 --- a/CI/circle_parallel.sh +++ b/CI/circle_parallel.sh @@ -89,24 +89,6 @@ elif [ "$NODE_INDEX" = "3" ]; then (cd samples/client/petstore/javascript-es6 && mvn integration-test) (cd samples/client/petstore/javascript-promise-es6 && mvn integration-test) -elif [ "$NODE_INDEX" = "4" ]; then - echo "Running node $NODE_INDEX ..." - - #wget https://www.python.org/ftp/python/3.8.9/Python-3.8.9.tgz - #tar -xf Python-3.8.9.tgz - #cd Python-3.8.9 - #./configure --enable-optimizations - #sudo make altinstall - pyenv install --list - pyenv install 3.7.12 - #pyenv install 2.7.14 #python2 no longer supported - pyenv global 3.7.12 - - (cd samples/openapi3/client/petstore/python && mvn integration-test) - (cd samples/openapi3/client/petstore/python-pydantic-v1 && mvn integration-test) - (cd samples/openapi3/client/petstore/python-aiohttp && mvn integration-test) - (cd samples/openapi3/client/petstore/python-pydantic-v1-aiohttp && mvn integration-test) - else echo "Running node $NODE_INDEX ..." java -version diff --git a/bin/configs/python-echo-api-disallowAdditionalPropertiesIfNotPresent-true.yaml b/bin/configs/python-echo-api-disallowAdditionalPropertiesIfNotPresent-true.yaml index e91fe1929d..8b15af490d 100644 --- a/bin/configs/python-echo-api-disallowAdditionalPropertiesIfNotPresent-true.yaml +++ b/bin/configs/python-echo-api-disallowAdditionalPropertiesIfNotPresent-true.yaml @@ -1,5 +1,5 @@ generatorName: python -outputDir: samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true +outputDir: samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent inputSpec: modules/openapi-generator/src/test/resources/3_0/echo_api.yaml templateDir: modules/openapi-generator/src/main/resources/python additionalProperties: diff --git a/samples-python-pydantic-v1-petstore.yaml b/samples-python-pydantic-v1-petstore.yaml deleted file mode 100644 index 21c80cc42d..0000000000 --- a/samples-python-pydantic-v1-petstore.yaml +++ /dev/null @@ -1,59 +0,0 @@ -name: "Python Client: Petstore" - -on: - pull_request: - paths: - - samples/openapi3/client/petstore/python-aiohttp/** - - samples/openapi3/client/petstore/python/** - - .github/workflows/samples-python-petstore.yaml - -jobs: - build: - name: Test Python client - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: - - "3.7" - - "3.8" - - "3.9" - - "3.10" - - "3.11" - sample: - - samples/openapi3/client/petstore/python-aiohttp - - samples/openapi3/client/petstore/python - services: - petstore-api: - image: swaggerapi/petstore - ports: - - 80:8080 - env: - SWAGGER_HOST: http://petstore.swagger.io - SWAGGER_BASE_PATH: /v2 - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 - id: py - with: - python-version: ${{ matrix.python-version }} - - - name: Cache - uses: actions/cache@v3 - with: - key: ${{ runner.os }}-python-${{ steps.py.outputs.python-version }}- - path: | - ~/.cache/pypoetry/virtualenvs/ - ~/.local/pipx/venvs/poetry/ - .mypy_cache/ - - - name: Install poetry - run: pipx install --python '${{ steps.py.outputs.python-path }}' poetry - - - name: Install - working-directory: ${{ matrix.sample }} - run: poetry install - - - name: Test - working-directory: ${{ matrix.sample }} - run: poetry run pytest -v diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/.github/workflows/python.yml b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/.github/workflows/python.yml similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/.github/workflows/python.yml rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/.github/workflows/python.yml diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/.gitignore b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/.gitignore similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/.gitignore rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/.gitignore diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/.gitlab-ci.yml b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/.gitlab-ci.yml similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/.gitlab-ci.yml rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/.gitlab-ci.yml diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/.openapi-generator-ignore b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/.openapi-generator-ignore similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/.openapi-generator-ignore rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/.openapi-generator-ignore diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/.openapi-generator/FILES b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/.openapi-generator/FILES similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/.openapi-generator/FILES rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/.openapi-generator/FILES diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/.openapi-generator/VERSION b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/.openapi-generator/VERSION similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/.openapi-generator/VERSION rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/.openapi-generator/VERSION diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/.travis.yml b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/.travis.yml similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/.travis.yml rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/.travis.yml diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/README.md b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/README.md similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/README.md rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/README.md diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/AuthApi.md b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/AuthApi.md similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/AuthApi.md rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/AuthApi.md diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/Bird.md b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/Bird.md similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/Bird.md rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/Bird.md diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/BodyApi.md b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/BodyApi.md similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/BodyApi.md rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/BodyApi.md diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/Category.md b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/Category.md similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/Category.md rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/Category.md diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/DataQuery.md b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/DataQuery.md similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/DataQuery.md rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/DataQuery.md diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/DefaultValue.md b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/DefaultValue.md similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/DefaultValue.md rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/DefaultValue.md diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/FormApi.md b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/FormApi.md similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/FormApi.md rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/FormApi.md diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/HeaderApi.md b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/HeaderApi.md similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/HeaderApi.md rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/HeaderApi.md diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/NumberPropertiesOnly.md b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/NumberPropertiesOnly.md similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/NumberPropertiesOnly.md rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/NumberPropertiesOnly.md diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/PathApi.md b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/PathApi.md similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/PathApi.md rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/PathApi.md diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/Pet.md b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/Pet.md similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/Pet.md rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/Pet.md diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/Query.md b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/Query.md similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/Query.md rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/Query.md diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/QueryApi.md b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/QueryApi.md similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/QueryApi.md rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/QueryApi.md diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/StringEnumRef.md b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/StringEnumRef.md similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/StringEnumRef.md rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/StringEnumRef.md diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/Tag.md b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/Tag.md similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/Tag.md rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/Tag.md diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.md b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.md similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.md rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.md diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.md b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.md similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/docs/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.md rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/docs/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.md diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/git_push.sh b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/git_push.sh similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/git_push.sh rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/git_push.sh diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/__init__.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/__init__.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/__init__.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/__init__.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/api/__init__.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/__init__.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/api/__init__.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/__init__.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/api/auth_api.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/auth_api.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/api/auth_api.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/auth_api.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/api/body_api.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/body_api.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/api/body_api.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/body_api.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/api/form_api.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/form_api.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/api/form_api.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/form_api.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/api/header_api.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/header_api.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/api/header_api.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/header_api.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/api/path_api.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/path_api.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/api/path_api.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/path_api.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/api/query_api.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/query_api.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/api/query_api.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api/query_api.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/api_client.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api_client.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/api_client.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api_client.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/api_response.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api_response.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/api_response.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/api_response.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/configuration.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/configuration.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/configuration.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/configuration.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/exceptions.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/exceptions.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/exceptions.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/exceptions.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/models/__init__.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/__init__.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/models/__init__.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/__init__.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/models/bird.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/bird.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/models/bird.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/bird.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/models/category.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/category.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/models/category.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/category.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/models/data_query.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/data_query.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/models/data_query.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/data_query.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/models/default_value.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/default_value.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/models/default_value.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/default_value.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/models/number_properties_only.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/number_properties_only.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/models/number_properties_only.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/number_properties_only.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/models/pet.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/pet.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/models/pet.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/pet.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/models/query.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/query.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/models/query.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/query.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/models/string_enum_ref.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/string_enum_ref.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/models/string_enum_ref.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/string_enum_ref.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/models/tag.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/tag.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/models/tag.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/tag.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/models/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/models/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/models/test_query_style_form_explode_true_array_string_query_object_parameter.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/test_query_style_form_explode_true_array_string_query_object_parameter.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/models/test_query_style_form_explode_true_array_string_query_object_parameter.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/models/test_query_style_form_explode_true_array_string_query_object_parameter.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/py.typed b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/py.typed similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/py.typed rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/py.typed diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/rest.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/rest.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/openapi_client/rest.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/rest.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/pyproject.toml b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/pyproject.toml similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/pyproject.toml rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/pyproject.toml diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/requirements.txt b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/requirements.txt similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/requirements.txt rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/requirements.txt diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/setup.cfg b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/setup.cfg similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/setup.cfg rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/setup.cfg diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/setup.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/setup.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/setup.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/setup.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test-requirements.txt b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test-requirements.txt similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test-requirements.txt rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test-requirements.txt diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/__init__.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/__init__.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/__init__.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/__init__.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_auth_api.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_auth_api.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_auth_api.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_auth_api.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_bird.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_bird.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_bird.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_bird.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_body_api.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_body_api.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_body_api.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_body_api.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_category.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_category.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_category.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_category.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_data_query.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_data_query.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_data_query.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_data_query.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_default_value.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_default_value.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_default_value.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_default_value.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_form_api.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_form_api.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_form_api.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_form_api.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_header_api.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_header_api.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_header_api.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_header_api.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_number_properties_only.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_number_properties_only.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_number_properties_only.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_number_properties_only.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_path_api.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_path_api.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_path_api.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_path_api.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_pet.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_pet.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_pet.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_pet.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_query.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_query.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_query.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_query.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_query_api.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_query_api.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_query_api.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_query_api.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_string_enum_ref.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_string_enum_ref.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_string_enum_ref.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_string_enum_ref.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_tag.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_tag.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_tag.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_tag.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_test_query_style_form_explode_true_array_string_query_object_parameter.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_test_query_style_form_explode_true_array_string_query_object_parameter.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/test/test_test_query_style_form_explode_true_array_string_query_object_parameter.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/test/test_test_query_style_form_explode_true_array_string_query_object_parameter.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/testfiles/test.gif b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/testfiles/test.gif similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/testfiles/test.gif rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/testfiles/test.gif diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/tests/__init__.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/tests/__init__.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/tests/__init__.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/tests/__init__.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/tests/test_manual.py b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/tests/test_manual.py similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/tests/test_manual.py rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/tests/test_manual.py diff --git a/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/tox.ini b/samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/tox.ini similarity index 100% rename from samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent-true/tox.ini rename to samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/tox.ini diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/.openapi-generator/VERSION b/samples/openapi3/client/3_0_3_unit_test/python-experimental/.openapi-generator/VERSION deleted file mode 100644 index 757e674004..0000000000 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/.openapi-generator/VERSION +++ /dev/null @@ -1 +0,0 @@ -7.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/python-aiohttp/dev-requirements.txt b/samples/openapi3/client/petstore/python-aiohttp/dev-requirements.txt deleted file mode 100755 index ccdfca6294..0000000000 --- a/samples/openapi3/client/petstore/python-aiohttp/dev-requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -tox -flake8 diff --git a/samples/openapi3/client/petstore/python-aiohttp/pom.xml b/samples/openapi3/client/petstore/python-aiohttp/pom.xml deleted file mode 100755 index 56b9deb95e..0000000000 --- a/samples/openapi3/client/petstore/python-aiohttp/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - 4.0.0 - org.openapitools - PythonNextgenAioHttpPetstoreTests - pom - 1.0-SNAPSHOT - Python OpenAPI3 Petstore Client - - - - maven-dependency-plugin - - - package - - copy-dependencies - - - ${project.build.directory} - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - test - integration-test - - exec - - - bash - - test_python3.sh - - - - - - - - diff --git a/samples/openapi3/client/petstore/python-aiohttp/test_python3.sh b/samples/openapi3/client/petstore/python-aiohttp/test_python3.sh deleted file mode 100755 index ef758bd445..0000000000 --- a/samples/openapi3/client/petstore/python-aiohttp/test_python3.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -REQUIREMENTS_FILE=dev-requirements.txt -REQUIREMENTS_OUT=dev-requirements.txt.log -SETUP_OUT=*.egg-info -VENV=.venv -DEACTIVE=false - -export LC_ALL=en_US.UTF-8 -export LANG=en_US.UTF-8 - -### set virtualenv -if [ -z "$VIRTUAL_ENV" ]; then - virtualenv $VENV --always-copy - source $VENV/bin/activate - DEACTIVE=true -fi - -### install dependencies -pip install -r $REQUIREMENTS_FILE | tee -a $REQUIREMENTS_OUT - -### run tests -tox || exit 1 - -### static analysis of code -#flake8 --show-source petstore_api/ - -### deactivate virtualenv -#if [ $DEACTIVE == true ]; then -# deactivate -#fi diff --git a/samples/openapi3/client/petstore/python/.openapi-generator-ignore b/samples/openapi3/client/petstore/python/.openapi-generator-ignore index 1e66827c8f..7484ee590a 100755 --- a/samples/openapi3/client/petstore/python/.openapi-generator-ignore +++ b/samples/openapi3/client/petstore/python/.openapi-generator-ignore @@ -21,4 +21,3 @@ #docs/*.md # Then explicitly reverse the ignore rule for a single file: #!docs/README.md -tox.ini diff --git a/samples/openapi3/client/petstore/python/.openapi-generator/FILES b/samples/openapi3/client/petstore/python/.openapi-generator/FILES index 090c6c431e..b85011e979 100755 --- a/samples/openapi3/client/petstore/python/.openapi-generator/FILES +++ b/samples/openapi3/client/petstore/python/.openapi-generator/FILES @@ -200,3 +200,4 @@ setup.cfg setup.py test-requirements.txt test/__init__.py +tox.ini diff --git a/samples/openapi3/client/petstore/python/Makefile b/samples/openapi3/client/petstore/python/Makefile deleted file mode 100755 index 739b587474..0000000000 --- a/samples/openapi3/client/petstore/python/Makefile +++ /dev/null @@ -1,21 +0,0 @@ - #!/bin/bash - -REQUIREMENTS_FILE=dev-requirements.txt -REQUIREMENTS_OUT=dev-requirements.txt.log -SETUP_OUT=*.egg-info -VENV=.venv - -clean: - rm -rf $(REQUIREMENTS_OUT) - rm -rf $(SETUP_OUT) - rm -rf $(VENV) - rm -rf .tox - rm -rf .coverage - find . -name "*.py[oc]" -delete - find . -name "__pycache__" -delete - -test: clean - bash ./test_python3.sh - -test-all: clean - bash ./test_python3.sh diff --git a/samples/openapi3/client/petstore/python/dev-requirements.txt b/samples/openapi3/client/petstore/python/dev-requirements.txt deleted file mode 100755 index ccdfca6294..0000000000 --- a/samples/openapi3/client/petstore/python/dev-requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -tox -flake8 diff --git a/samples/openapi3/client/petstore/python/pom.xml b/samples/openapi3/client/petstore/python/pom.xml deleted file mode 100755 index f3297df35e..0000000000 --- a/samples/openapi3/client/petstore/python/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - 4.0.0 - org.openapitools - PythonPetstoreTests - pom - 1.0-SNAPSHOT - Python OpenAPI3 Petstore Client - - - - maven-dependency-plugin - - - package - - copy-dependencies - - - ${project.build.directory} - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - test - integration-test - - exec - - - make - - test-all - - - - - - - - diff --git a/samples/openapi3/client/petstore/python/test_python3.sh b/samples/openapi3/client/petstore/python/test_python3.sh deleted file mode 100755 index f617f3adfa..0000000000 --- a/samples/openapi3/client/petstore/python/test_python3.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -REQUIREMENTS_FILE=dev-requirements.txt -REQUIREMENTS_OUT=dev-requirements.txt.log -SETUP_OUT=*.egg-info -VENV=venv -DEACTIVE=false - -export LC_ALL=en_US.UTF-8 -export LANG=en_US.UTF-8 - -### set virtualenv -if [ -z "$VIRTUAL_ENV" ]; then - virtualenv $VENV --always-copy - source $VENV/bin/activate - DEACTIVE=true -fi - -### install dependencies -pip install -r $REQUIREMENTS_FILE | tee -a $REQUIREMENTS_OUT - -### run tests -tox || exit 1 - -### static analysis of code -#flake8 --show-source petstore_api/ - -### deactivate virtualenv -#if [ $DEACTIVE == true ]; then -# deactivate -#fi