Skip to content

Commit

Permalink
chore: Upgrade to later version of gcp-uploader and protobuf (#1741)
Browse files Browse the repository at this point in the history
* chore: Upgrade to later version of gcp-uploader and protobuf

* chore: Add secretstorage version

* chore: Use python 3.9.13

* chore: Unpin all python versions

* chore: Rerun pipcompile tool

* chore: Rerun pipcompile tool with --allow-unsafe

* chore: Add --require-hashes

* chore: Update requirements file

* chore: Remove --require-hashes

* chore: Print python version

* chore: Add new generated hashes for requirements.txt

* chore: Remove python version check in cloud build

* chore: Allow synthtool to update python dependencies

* chore: Add typing-extensions into requirements

* chore: Unpin docker requirements.in file

* chore: Add java synthtool validation

* chore: Add check to import java synthtool python package
  • Loading branch information
lqiu96 authored Jan 19, 2023
1 parent a5e7dbd commit 91904bf
Show file tree
Hide file tree
Showing 6 changed files with 106 additions and 169 deletions.
21 changes: 16 additions & 5 deletions docker/owlbot/java/container_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,26 @@
# See the License for the specific language governing permissions and
# limitations under the License.

schemaVersion: 1.0.0
schemaVersion: 2.0.0
commandTests:
- name: "version"
command: ["java", "-version"]
command: "java"
args: ["-version"]
# java -version outputs to stderr...
expectedError: ["(java|openjdk) version \"1.8.*\""]
- name: "formatter"
command: ["java", "-jar", "/owlbot/google-java-format.jar", "--version"]
command: "java"
args: ["-jar", "/owlbot/google-java-format.jar", "--version"]
expectedError: ["google-java-format: Version 1.7"]
- name: "python"
command: ["python", "--version"]
expectedOutput: ["Python 3.6.1"]
command: "python"
args: ["--version"]
expectedOutput: ["Python 3.9.13"]
- name: "java synthtool validation"
command: "python"
# Use YAML List Style for this command
# Having to use backslash for quotes (\") was resulting in an invalid test
args:
- -c
- 'import synthtool.languages.java; print("import success")'
expectedOutput: ["import success"]
22 changes: 11 additions & 11 deletions docker/owlbot/java/src/requirements.in
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
attrs==22.1.0
click==7.1.2
jinja2==3.0.3
lxml==4.6.5
typing==3.7.4.3
markupsafe==2.0.1
colorlog==6.7.0
protobuf==3.19.5
watchdog==2.1.9
requests==2.27.1
pyyaml==6.0
attrs
click
jinja2
lxml
typing
markupsafe
colorlog
protobuf
watchdog
requests
pyyaml
4 changes: 2 additions & 2 deletions docker/owlbot/java/src/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# This file is autogenerated by pip-compile with python 3.10
# To update, run:
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# pip-compile --allow-unsafe --generate-hashes requirements.in
#
Expand Down
2 changes: 1 addition & 1 deletion renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"extends": [
"schedule:weekly"
],
"ignorePaths": ["*/**", "synthtool/gcp/templates/java_library/.kokoro/requirements.txt", "synthtool/docker/owlbot/java/src/requirements.txt"],
"ignorePaths": ["*/**"],
"internalChecksFilter": "strict",
"stabilityDays": 30,
"timezone": "America/Los_Angeles",
Expand Down
40 changes: 6 additions & 34 deletions synthtool/gcp/templates/java_library/.kokoro/requirements.in
Original file line number Diff line number Diff line change
@@ -1,34 +1,6 @@
gcp-docuploader==0.6.3
google-crc32c==1.3.0
googleapis-common-protos==1.56.3
gcp-releasetool==1.9.1
cryptography==38.0.3
cachetools==4.2.4
cffi==1.15.1
jeepney==0.7.1
jinja2==3.0.3
markupsafe==2.0.1
keyring==23.4.1
packaging==21.3
protobuf==3.19.5
pyjwt==2.4.0
pyparsing==3.0.9
pycparser==2.21
pyperclip==1.8.2
python-dateutil==2.8.2
requests==2.27.1
certifi==2022.12.7
importlib-metadata==4.8.3
zipp==3.6.0
google_api_core==2.8.2
google-cloud-storage==2.0.0
google-resumable-media==2.3.3
google-cloud-core==2.3.1
typing-extensions==4.1.1
urllib3==1.26.12
zipp==3.6.0
rsa==4.9
six==1.16.0
attrs==22.1.0
google-auth==2.14.1
idna==3.4
gcp-docuploader
gcp-releasetool
wheel
setuptools
typing-extensions
click<8.1.0
Loading

0 comments on commit 91904bf

Please sign in to comment.