generated with buf

Author: rfrerebe

.github/workflows/build.yml

@@ -15,8 +15,7 @@ jobs:
         python-version: '3.x'
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
-        pip install -r requirements.txt
+        python -m pip install --upgrade build
     - name: Set VERSION environment variable
       run: |
         echo GitHub_ref: $GITHUB_REF

build.py

@@ -1,13 +1,7 @@
 #!/usr/bin/python
 
 import os
-from pickle import FALSE
 import subprocess
-import shutil
-
-def create_dir_if_needed(dir):
-    if(not(os.path.isdir(dir))):
-        os.makedirs(dir)
 
 def delete_dir_if_needed(top_dir):
     if(os.path.isdir(top_dir)):
@@ -18,109 +12,20 @@ def delete_dir_if_needed(top_dir):
                 os.rmdir(os.path.join(root, dir))
         os.rmdir(top_dir)
 
-def is_grpc_file (path):
-    """Test if a *.proto file describe a grpc service"""
-    for line in open(path, 'r').readlines() :
-        if line.startswith('service ') :
-            return True
-    return False
-
-def create_files_tuples(dir):
-    """Create the lists of files from `dir` and ventilate them in 3 categories :
-    - grpc files (containing a grpc service)
-    - proto files (without a grpc service)
-    - python files
-
-    Returns a tuple with 3 lists. 
-    First list contains grpc files. 
-    Second list contains regular proto files
-    Third list contains python files
-    """
-    grpc_files = []
-    proto_files = []
-    python_files = []
-    print(f"create_files_tuples(dir={dir})")
-    for root, dirs, files in os.walk(dir, topdown=True):
-        for file in files:
-            path = os.path.join(root, file)
-            if (file.endswith('.proto')) :
-                if(is_grpc_file(path)) :
-                    print(f"grpc:   {path}")
-                    grpc_files.append(path)
-                else:
-                    proto_files.append(path)
-                    print(f"proto:  {path}")
-            if (file.endswith('.py')) :
-                print(f"python: {path}")
-                python_files.append(path)
-
-    return (grpc_files,proto_files,python_files)
-
-def generate_grpc_file(files, scr_dir, target_dir):
-    create_dir_if_needed(target_dir)
-    all_files= " ".join(files)
-    cmd = f"python3 -m grpc_tools.protoc --proto_path={scr_dir} --python_out={target_dir} --grpc_python_out={target_dir} {all_files}"
-    print(cmd)
-    subprocess.call(cmd, cwd=scr_dir, shell=True)
-
-def generate_proto_file(files, scr_dir, target_dir):
-    all_files= " ".join(files)
-    create_dir_if_needed(target_dir)
-    cmd = f"python3 -m grpc_tools.protoc --proto_path={scr_dir} --python_out={target_dir} {all_files}"
-    print(cmd)
-    subprocess.call(cmd, cwd=scr_dir, shell=True)
-
-def copy_python_sources(files, src_dir, target_dir):
-    create_dir_if_needed(target_dir)
-    for file in files:
-        file2 = file.replace(src_dir, target_dir)
-        folder2=os.path.dirname(file2)
-        create_dir_if_needed(folder2)
-        print(f"Copying \n  {file} to \n  {file2}")
-        shutil.copy(file, file2)
-
-def generate(tuple_of_list, src_dir, target_dir):
-    grpc_files = tuple_of_list[0]
-    proto_files = tuple_of_list[1]
-    python_files = tuple_of_list[2]
-
-    copy_python_sources(python_files, src_dir, target_dir)
-    generate_grpc_file(grpc_files, src_dir, target_dir)
-    generate_proto_file(proto_files, src_dir, target_dir)
-    
-def add_namespace_import_to_init_py(dir):
-    for root, _, _ in os.walk(dir, topdown=True):
-        path = os.path.join(root,'__init__.py')
-        with open(path, 'w') as f:
-            f.write("__import__('pkg_resources').declare_namespace(__name__)")
-
-def extract_version(data):
-    version_pattern ='version="'
-    l = len(version_pattern)
-    start = data.find('version="')
-    end = data.find('"', start + l + 1)
-    return data[start + l : end]
-
-def replace_version_in_setup(dir):
+def update_version(dir):
     # Read in the file
-    path = os.path.join(dir,'setup.py')
-    with open(path, 'r') as file :
-        filedata = file.read()
-
-    old_version = extract_version(filedata)
+    path = os.path.join(dir,'__init__.py')
 
-    # Check is done before taht this env variable exists
+    # Check is done before that this env variable exists
     new_version = os.getenv('VERSION', "")
-
-    # Replace the target string
-    filedata = filedata.replace(old_version, new_version)
+    print(f"__version__ = \"{new_version}\"")
 
     # Write the file out again
     with open(path, 'w') as file:
-        file.write(filedata)
+        file.write(f"__version__ = \"{new_version}\"")
 
 def generate_package(root_dir):
-    cmd = "python3 setup.py sdist"
+    cmd = "python3 -m build"
     subprocess.call(cmd, cwd=root_dir, shell=True)
 
 def check_environement():
@@ -142,55 +47,6 @@ def check_environement():
         raise Exception("missing env var TWINE_PASSWORD")
     password = ''
 
-    # # used by publish_package function
-    # key = os.getenv('PYPI_PUBLISH_INDIRECT_KEY','')
-    # if(key == ''):
-    #     raise Exception("missing env var PYPI_PUBLISH_INDIRECT_KEY")
-
-    # # used by publish_package function
-    # user = os.getenv('PYPI_USERNAME','')
-    # if(user == ''):
-    #     raise Exception("missing env var PYPI_USERNAME")
-
-    # # used by publish_package function
-    # repository = os.getenv('PYPI_REPOSITORY','')
-    # if(repository == ''):
-    #     raise Exception("missing env var PYPI_REPOSITORY")
-
-def publish_test_package(root_dir):
-    # pass_out generated with
-    # > echo -n ${{PASSWORD}} > ./pass
-    # > openssl aes-256-cbc -pbkdf2 -e -k "${{PYPI_PUBLISH_INDIRECT_KEY}}" < ./pass > ./pass_out
-
-    # used by publish_package function
-    key = os.getenv('PYPI_PUBLISH_INDIRECT_KEY','')
-    if(key == ''):
-        raise Exception("missing env var PYPI_PUBLISH_INDIRECT_KEY")
-
-    # used by publish_package function
-    user = os.getenv('PYPI_USERNAME','')
-    if(user == ''):
-        raise Exception("missing env var PYPI_USERNAME")
-
-    # used by publish_package function
-    repository = os.getenv('PYPI_REPOSITORY','')
-    if(repository == ''):
-        raise Exception("missing env var PYPI_REPOSITORY")
-
-    # convert password, as strange chars are not always accepted in env var...
-    path = os.path.join(root_dir, "pass")
-    path_out = os.path.join(root_dir, "..", "pass_out")
-    openssl_cmd = f'openssl aes-256-cbc -pbkdf2 -d -k "{key}" < {path_out} > {path}'
-    subprocess.call(openssl_cmd, cwd=root_dir, shell=True)
-
-    with open(path, 'r') as f:
-        password = f.read()
-
-    cmd = f"python3 -m twine upload --repository {repository} dist/* -u {user} -p '{password}'"
-
-    os.remove(path)
-    subprocess.call(cmd, cwd=root_dir, shell=True)
-
 def publish_package(root_dir):
     # used by publish_package function
     cmd = f"python3 -m twine upload dist/*"
@@ -205,36 +61,21 @@ def main():
     # define vars
     root = os.path.dirname(os.path.realpath(__file__))
     src_dir = os.path.join(root, "src")
-    out_dir = os.path.join(root, "python")
-    stx_dir = os.path.join(out_dir, "systemathics")
-    dist_dir = os.path.join(out_dir, "dist")
+    stx_dir = os.path.join(src_dir, "systemathics","apis")
+    dist_dir = os.path.join(src_dir, "dist")
 
     print("Clean old generated code")
-    create_dir_if_needed(out_dir)
-    delete_dir_if_needed(stx_dir)
     delete_dir_if_needed(dist_dir)
 
-    # get proto files (grpc and regular)
-    print("Get files")
-    result = create_files_tuples(src_dir)
-
-    # generate new python file from proto
-    print("Generate")
-    generate(result, src_dir, out_dir)
-
-    # add proto import to __init__.py files
-    print("Add namespace import to __init__.py files")
-    add_namespace_import_to_init_py(stx_dir)
-
     # generate package
     print("Setting version in setup.py")
-    replace_version_in_setup(out_dir)
+    update_version(stx_dir)
     print("Generate package")
-    generate_package(out_dir)
+    generate_package(src_dir)
 
     # publish package
     print("Publish package")
-    publish_package(out_dir)
+    publish_package(src_dir)
 
 if __name__ == "__main__":
     # execute only if run as a script

pass_out

@@ -1,5 +1,4 @@
-About Ganymede
-==============
+# About Ganymede
 
 Built as cloud native, Ganymede is a fully managed platform,
 continuously updated with high-quality, curated, and cross validated
@@ -11,21 +10,19 @@ optimized for fast response times, supports full order book natively and
 allows fine grained/customizable trade and quote conditions mapping and
 filtering.
 
-For further information, please visit `Ganymede home
-page <https://ganymede.cloud>`__
+For further information, please visit [Ganymede home page](https://ganymede.cloud)
 
-About this package
-===================
+## About this package
 
-This package provides up-to-date gRPC clients to access `Ganymede
-API <https://ganymede.cloud/api-documentation.html>`__
 
-Python version
+This package provides up-to-date gRPC clients to access [Ganymede API](https://ganymede.cloud/api-documentation.html)
 
-About us
-========
+Python version 3
 
-`Systemathics <https://systemathics.com>`__ is a French fintech founded
+## About us
+
+
+[Systemathics](https://systemathics.com) is a French fintech founded
 in 2008 developing its innovative products with the highest quality
 standards 100% in France. Our main mission is to provide global
 investors with a complete end-to-end solution to systematize alpha

python/setup.cfg

@@ -0,0 +1,37 @@
+[build-system]
+requires = ["setuptools>=68.0"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "systemathics.apis"
+dynamic = ["version"]
+authors = [
+  { name="Systemathics", email="contact@systemathics.com" },
+]
+description = "Grpc stub for Systemathics API."
+readme = "README.md"
+requires-python = ">=3.7"
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+    "Intended Audience :: Developers",
+    "Intended Audience :: Information Technology",
+    "Intended Audience :: Science/Research"
+]
+license = {file = "LICENSE"}
+dependencies = [
+  'googleapis-common-protos'
+]
+
+[project.urls]
+Homepage = "https://ganymede.cloud"
+"Bug Tracker" = "https://github.com/systemathics/sdk-python/issues"
+Documentation = "https://ganymede.cloud/api-documentation.html"
+
+[tool.setuptools.packages.find]
+where = ["."]
+include = ["systemathics.apis*"]
+
+[tool.setuptools.dynamic]
+version = {attr = "systemathics.apis.__version__"}