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

repo-sync-2024-03-20T18:39:14+0800 #15

Merged
merged 1 commit into from
Mar 20, 2024
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
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ jobs:
name: "Verify proto"
command: |
set -ex
python3 -m pip install grpcio-tools mypy-protobuf "protobuf>=4,<5"
python protoc.py
python3 -m pip install -r ./python/dev-requirements.txt
python3 protoc.py

linux_publish:
docker:
Expand All @@ -62,7 +62,7 @@ jobs:
conda create -n build python=3.10 -y
conda activate build
cd python
python3 -m pip install grpcio-tools mypy-protobuf "protobuf>=4,<5" twine
python3 -m pip install -r dev-requirements.txt
make build
ls dist/*.whl
python3 -m twine upload -r pypi -u __token__ -p ${PYPI_TWINE_TOKEN} dist/*.whl
Expand All @@ -78,4 +78,4 @@ workflows:
publish:
when: << pipeline.parameters.GHA_Action >>
jobs:
- linux_publish
- linux_publish
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
OPENSOURCE-CLEAN REMOVE 2
target
java-protos
.idea
build
dist
Expand Down
3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ include = ["secretflowapis", "lib.rs", "build.rs"]


[lib]
name = "sdc_apis"
name = "sdc_apis"
path = "lib.rs"

[dependencies]
Expand All @@ -24,4 +24,3 @@ prost-wkt-types = "0.4"
[build-dependencies]
tonic-build = "0.9.2"
prost-wkt-build = "0.4"

2 changes: 1 addition & 1 deletion python/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/usr/bin/env python3
# *_* coding: utf-8 *_*
# *_* coding: utf-8 *_*
4 changes: 4 additions & 0 deletions python/dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-r requirements.txt
grpcio-tools
mypy-protobuf
twine
2 changes: 1 addition & 1 deletion python/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
protobuf>=4, <5
protobuf>=4, <5
14 changes: 11 additions & 3 deletions python/setup.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
import setuptools
import os
from pathlib import Path
from datetime import date

__version__ = "0.2.1.dev$$DATE$$"


def get_version():
date_str = date.today().strftime("%Y%m%d")
return __version__.replace("$$DATE$$", date_str)


def read(fname):
with open(os.path.join(os.path.dirname(__file__), fname)) as f:
with open(Path(__file__).resolve().parent / Path(fname)) as f:
return f.read()


setuptools.setup(
name="sdc-apis",
version="0.2.1.dev240320",
version=get_version(),
author="secretflow",
author_email="[email protected]",
description="SecretFlow Data Capsule apis proto generated python",
Expand Down
Loading