Skip to content

Commit f900c83

Browse files
committed
Merge remote-tracking branch 'origin/master' into fix-dotnet-exception
2 parents 9a1f73c + a05a5b0 commit f900c83

File tree

9 files changed

+15
-12
lines changed

9 files changed

+15
-12
lines changed

composer.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/cli/lib/commands/generic.js.twig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ const client = new Command("client")
8282
}
8383

8484
let client = new Client().setEndpoint(endpoint);
85+
client.setProject('console');
8586
if (selfSigned || globalConfig.getSelfSigned()) {
8687
client.setSelfSigned(true);
8788
}

templates/node/package.json.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@types/node": "^18.16.1"
1515
},
1616
"dependencies": {
17-
"axios": "^1.3.6",
17+
"axios": "^1.4.0",
1818
"form-data": "^4.0.0"
1919
}
2020
}

templates/python/.travis.yml.twig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
language: python
22

3+
dist: bionic
4+
35
python:
46
- "3.8"
57

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
requests==2.29.0
1+
requests==2.31.0

templates/python/setup.cfg.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[metadata]
2-
description-file = README.md
2+
description_file = README.md

tests/Python310Test.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class Python310Test extends Base
1414
protected array $build = [
1515
'cp tests/languages/python/tests.py tests/sdks/python/test.py',
1616
'echo "" > tests/sdks/python/__init__.py',
17-
'docker run --rm -v $(pwd):/app -w /app --env PIP_TARGET=tests/sdks/python/vendor python:3.10 pip install -r tests/sdks/python/requirements.txt --upgrade',
17+
'docker run --rm -v $(pwd):/app -w /app --env PIP_TARGET=tests/sdks/python/vendor python:3.10-alpine pip install -r tests/sdks/python/requirements.txt --upgrade',
1818
];
1919
protected string $command =
2020
'docker run --rm -v $(pwd):/app -w /app --env PIP_TARGET=tests/sdks/python/vendor --env PYTHONPATH=tests/sdks/python/vendor python:3.10-alpine python tests/sdks/python/test.py';

tests/Python38Test.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class Python38Test extends Base
1414
protected array $build = [
1515
'cp tests/languages/python/tests.py tests/sdks/python/test.py',
1616
'echo "" > tests/sdks/python/__init__.py',
17-
'docker run --rm -v $(pwd):/app -w /app --env PIP_TARGET=tests/sdks/python/vendor python:3.8 pip install -r tests/sdks/python/requirements.txt --upgrade',
17+
'docker run --rm -v $(pwd):/app -w /app --env PIP_TARGET=tests/sdks/python/vendor python:3.8-alpine pip install -r tests/sdks/python/requirements.txt --upgrade',
1818
];
1919
protected string $command =
2020
'docker run --rm -v $(pwd):/app -w /app --env PIP_TARGET=tests/sdks/python/vendor --env PYTHONPATH=tests/sdks/python/vendor python:3.8-alpine python tests/sdks/python/test.py';

tests/Python39Test.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class Python39Test extends Base
1414
protected array $build = [
1515
'cp tests/languages/python/tests.py tests/sdks/python/test.py',
1616
'echo "" > tests/sdks/python/__init__.py',
17-
'docker run --rm -v $(pwd):/app -w /app --env PIP_TARGET=tests/sdks/python/vendor python:3.9 pip install -r tests/sdks/python/requirements.txt --upgrade',
17+
'docker run --rm -v $(pwd):/app -w /app --env PIP_TARGET=tests/sdks/python/vendor python:3.9-alpine pip install -r tests/sdks/python/requirements.txt --upgrade',
1818
];
1919
protected string $command =
2020
'docker run --rm -v $(pwd):/app -w /app --env PIP_TARGET=tests/sdks/python/vendor --env PYTHONPATH=tests/sdks/python/vendor python:3.9-alpine python tests/sdks/python/test.py';

0 commit comments

Comments
 (0)