mirror of
https://github.com/openziti/zrok.git
synced 2024-12-22 23:02:52 +01:00
small build changes
This commit is contained in:
parent
d4a6af15b7
commit
31da710edd
74
.github/workflows/build-wheels.yml
vendored
Normal file
74
.github/workflows/build-wheels.yml
vendored
Normal file
@ -0,0 +1,74 @@
|
||||
name: build wheels
|
||||
|
||||
on:
|
||||
release:
|
||||
types: [released]
|
||||
|
||||
jobs:
|
||||
build_wheels:
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
spec:
|
||||
- { name: 'linux x86_64', runner: ubuntu-20.04, target: manylinux_2_27_x86_64 }
|
||||
- { name: 'macOS x86_64', runner: macos-11, target: macosx_10_14_x86_64 }
|
||||
- { name: 'Windows x86_64', runner: windows-2019, target: win_amd64 }
|
||||
name: building ${{ matrix.spec.name }}
|
||||
runs-on: ${{ matrix.spec.runner }}
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Setup Python
|
||||
uses: actions/setup-python@v3
|
||||
with:
|
||||
python-version: '3.x'
|
||||
|
||||
- name: Install Python Tools
|
||||
run: python -m pip install -U pip setuptools
|
||||
|
||||
- name: Build distro
|
||||
env:
|
||||
ZROK_VERSION: ${{ github.event.release.tag_name }}
|
||||
run: |
|
||||
python setup.py sdist
|
||||
|
||||
- uses: actions/upload-artifact@v3
|
||||
if: startsWith(matrix.spec.name, 'linux')
|
||||
with:
|
||||
name: openziiti-sdist
|
||||
path: ./dist/*
|
||||
|
||||
publish:
|
||||
runs-on: ubuntu-20.04
|
||||
needs: [ build_wheels ]
|
||||
steps:
|
||||
- name: Download artifacts
|
||||
uses: actions/download-artifact@v3
|
||||
with:
|
||||
path: download
|
||||
|
||||
- name: check
|
||||
run: |
|
||||
ls -lR download
|
||||
mkdir dist
|
||||
cp download/*/* dist
|
||||
|
||||
- name: Publish wheels (TestPYPI)
|
||||
uses: pypa/gh-action-pypi-publish@release/v1
|
||||
permissions:
|
||||
id-token: write
|
||||
with:
|
||||
packages_dir: dist
|
||||
skip_existing: true
|
||||
verbose: true
|
||||
|
||||
- name: Publish wheels (PyPI)
|
||||
uses: pypa/gh-action-pypi-publish@release/v1
|
||||
permissions:
|
||||
id-token: write
|
||||
with:
|
||||
packages_dir: dist
|
||||
verbose: true
|
@ -1 +1 @@
|
||||
3.0.46
|
||||
3.0.50
|
@ -1,19 +1,12 @@
|
||||
# coding: utf-8
|
||||
|
||||
"""
|
||||
zrok
|
||||
|
||||
zrok client access # noqa: E501
|
||||
|
||||
OpenAPI spec version: 0.3.0
|
||||
|
||||
Generated by: https://github.com/swagger-api/swagger-codegen.git
|
||||
"""
|
||||
|
||||
from setuptools import setup, find_packages # noqa: H301
|
||||
import os
|
||||
|
||||
NAME = "zrok_sdk"
|
||||
VERSION = "1.0.0"
|
||||
VERSION = "dev"
|
||||
try:
|
||||
VERSION += '.dev' + os.environ['ZROK_VERSION']
|
||||
except KeyError:
|
||||
pass
|
||||
# To install the library, run the following
|
||||
#
|
||||
# python setup.py install
|
||||
@ -27,14 +20,14 @@ setup(
|
||||
name=NAME,
|
||||
version=VERSION,
|
||||
description="zrok",
|
||||
author_email="",
|
||||
url="",
|
||||
author_email="cameron.otts@netfoundry.io",
|
||||
url="https://zrok.io",
|
||||
python_requires='>=3.10',
|
||||
keywords=["Swagger", "zrok"],
|
||||
install_requires=REQUIRES,
|
||||
packages=find_packages(),
|
||||
include_package_data=True,
|
||||
long_description="""\
|
||||
zrok client access # noqa: E501
|
||||
Geo-scale, next-generation peer-to-peer sharing platform built on top of OpenZiti.
|
||||
"""
|
||||
)
|
||||
|
@ -25,7 +25,7 @@ def CreateShare(root: Root, request: model.ShareRequest) -> model.Share:
|
||||
raise Exception("invalid username:password pair: " + pair)
|
||||
|
||||
if request.OauthProvider != "":
|
||||
out.OauthProvider = model.AUTH_SCHEME_OAUTH
|
||||
out.auth_scheme = model.AUTH_SCHEME_OAUTH
|
||||
|
||||
try:
|
||||
zrok = root.Client()
|
||||
|
Loading…
Reference in New Issue
Block a user