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.

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

support for python 3.10 #405

Merged
merged 7 commits into from
Feb 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/build-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
fail-fast: false
matrix:
os-artifact: [ [ubuntu-latest, linux], [windows-latest, windows], [macos-latest, macos] ]
python-version: [3.8, 3.9 ] # '3.10' has issues for now
python-version: [3.8, 3.9, '3.10']
steps:
- uses: actions/checkout@v2
- name: Download ${{ matrix.os-artifact[0] }} binaries
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
run: |
python -m pip install -r requirements.txt
python -m pip install build
python ../devops/build_sdks.py --package-version=${{ steps.setversion.outputs.packageVersion }}
python ../devops/build_sdks.py --package-version=${{ steps.setversion.outputs.packageVersion }} --language=python
python -m build --sdist --wheel --outdir dist/ .
shell: pwsh
working-directory: python
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
run: |
gem install bundler
bundle install
python ../devops/build_sdks.py --package-version=${{ steps.setversion.outputs.packageVersion }}
python ../devops/build_sdks.py --package-version=${{ steps.setversion.outputs.packageVersion }} --language=ruby

mkdir -p $HOME/.gem
touch $HOME/.gem/credentials
Expand Down
5 changes: 4 additions & 1 deletion devops/build_sdks.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,10 @@ def copy_okapi_libs(copy_to: str, windows_path='windows'):

for copy_file in glob.glob(join(copy_from, '*.*')):
shutil.copy2(copy_file, copy_to)
shutil.copy2(join(okapi_dir, 'libs', 'C_header', 'okapi.h'), copy_to)
try:
shutil.copy2(join(okapi_dir, 'libs', 'C_header', 'okapi.h'), copy_to)
except FileNotFoundError:
pass


def clean_dir(language_dir: str) -> None:
Expand Down
4 changes: 4 additions & 0 deletions docs/reference/go/go.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#

---
Readme created from Go doc with [goreadme](https://github.com/posener/goreadme)
9 changes: 4 additions & 5 deletions java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ plugins {
def jarDomainId = "id"
def jarGroupId = "trinsic"
def jarArtifactId = "services"
def jarVersion = "1.2.0"
def jarVersion = "1.3.1"

apply plugin: 'kotlin'

Expand Down Expand Up @@ -54,14 +54,15 @@ repositories {
}

dependencies {
compileOnly 'org.apache.tomcat:annotations-api:6.0.53' // necessary for Java 9+

implementation 'org.jetbrains:annotations:22.0.0'
implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.19.1'
implementation 'com.google.protobuf:protobuf-java-util:3.19.1'
implementation group: 'net.java.dev.jna', name: 'jna', version: '5.8.0'
implementation 'io.grpc:grpc-kotlin-stub:1.2.0'
implementation 'io.grpc:grpc-protobuf:1.42.1'
implementation 'com.google.protobuf:protobuf-kotlin:3.19.1'

implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0'

testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
Expand All @@ -72,10 +73,8 @@ dependencies {
implementation 'io.grpc:grpc-protobuf:1.42.1'
implementation 'io.grpc:grpc-stub:1.42.1' // This has to match the version of protoc-gen-grpc-java used in `sdk/devops/generate_proto_files.py`
// https://mvnrepository.com/artifact/io.github.rctcwyvrn/blake3
implementation 'io.github.rctcwyvrn:blake3:1.3'
implementation 'io.leonard:base58:0.0.2'
compileOnly 'org.apache.tomcat:annotations-api:6.0.53' // necessary for Java 9+

implementation 'io.github.rctcwyvrn:blake3:1.3'
implementation 'id.trinsic:okapi:1.2.2'
}

Expand Down
4 changes: 2 additions & 2 deletions python/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
betterproto~=2.0.0b4
grpclib~=0.4.1
grpclib~=0.4.3rc2
grpcio-tools
trinsic-okapi~=1.2.0
blake3~=0.2.1
blake3~=0.3.1