Skip to content

Commit

Permalink
Merge pull request #234 from WebexCommunity/dev/v2/cmlccie
Browse files Browse the repository at this point in the history
New WebexPythonSDK v2!
  • Loading branch information
cmlccie authored Jul 21, 2024
2 parents 9c1ca18 + 95f6157 commit 1a0a17e
Show file tree
Hide file tree
Showing 157 changed files with 3,002 additions and 6,511 deletions.
24 changes: 0 additions & 24 deletions .flake8

This file was deleted.

1 change: 0 additions & 1 deletion .gitattributes

This file was deleted.

18 changes: 9 additions & 9 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@ jobs:
- name: Get Webex Token
id: webex_token
run: |
WEBEX_TEAMS_ACCESS_TOKEN=$(curl -s ${{ secrets.WEBEX_TOKEN_KEEPER_URL }} | jq -r .access_token)
echo "WEBEX_TEAMS_ACCESS_TOKEN=$WEBEX_TEAMS_ACCESS_TOKEN" >> "$GITHUB_OUTPUT"
echo "::add-mask::$WEBEX_TEAMS_ACCESS_TOKEN"
WEBEX_ACCESS_TOKEN=$(curl -s ${{ secrets.WEBEX_TOKEN_KEEPER_URL }} | jq -r .access_token)
echo "WEBEX_ACCESS_TOKEN=$WEBEX_ACCESS_TOKEN" >> "$GITHUB_OUTPUT"
echo "::add-mask::$WEBEX_ACCESS_TOKEN"
- name: Build and Test
run: script/ci
env:
WEBEX_TEAMS_ACCESS_TOKEN: ${{ steps.webex_token.outputs.WEBEX_TEAMS_ACCESS_TOKEN }}
WEBEX_TEAMS_TEST_DOMAIN: ${{ vars.WEBEX_TEAMS_TEST_DOMAIN }}
WEBEX_TEAMS_TEST_ID_START: ${{ vars.WEBEX_TEAMS_TEST_ID_START }}
WEBEX_TEAMS_TEST_FILE_URL: ${{ vars.WEBEX_TEAMS_TEST_FILE_URL }}
WEBEX_TEAMS_GUEST_ISSUER_ID: ${{ secrets.WEBEX_TEAMS_GUEST_ISSUER_ID }}
WEBEX_TEAMS_GUEST_ISSUER_SECRET: ${{ secrets.WEBEX_TEAMS_GUEST_ISSUER_SECRET }}
WEBEX_ACCESS_TOKEN: ${{ steps.webex_token.outputs.WEBEX_ACCESS_TOKEN }}
WEBEX_TEST_DOMAIN: ${{ vars.WEBEX_TEST_DOMAIN }}
WEBEX_TEST_ID_START: ${{ vars.WEBEX_TEST_ID_START }}
WEBEX_TEST_FILE_URL: ${{ vars.WEBEX_TEST_FILE_URL }}
WEBEX_GUEST_ISSUER_ID: ${{ secrets.WEBEX_GUEST_ISSUER_ID }}
WEBEX_GUEST_ISSUER_SECRET: ${{ secrets.WEBEX_GUEST_ISSUER_SECRET }}
- name: Upload Distribution Files
uses: actions/upload-artifact@v4
with:
Expand Down
25 changes: 0 additions & 25 deletions .ruff.toml

This file was deleted.

30 changes: 0 additions & 30 deletions .travis.yml

This file was deleted.

11 changes: 11 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"recommendations": [
"charliermarsh.ruff",
"github.vscode-github-actions",
"github.vscode-pull-request-github",
"ms-python.debugpy",
"ms-python.python",
"ms-python.vscode-pylance",
"streetsidesoftware.code-spell-checker"
]
}
6 changes: 6 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"python.testing.unittestEnabled": false,
"python.testing.pytestEnabled": true,
"python.testing.pytestArgs": ["-s", "-m", "not slow and not manual"],
"cSpell.words": ["ciscosparkapi", "webexpythonsdk", "webexteamssdk"]
}
4 changes: 0 additions & 4 deletions MANIFEST.in

This file was deleted.

44 changes: 44 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
.PHONY: clean setup update format lint build tests tests-manual tests-slow tests-all docs

clean:
find . -name '*.pyc' -exec rm -f {} +
find . -name '*.pyo' -exec rm -f {} +
find . -name '*~' -exec rm -f {} +
find . -name '__pycache__' -exec rm -fr {} +
rm -rf build/
rm -rf dist/
rm -rf .cache/
rm -f .coverage
rm -rf .pytest_cache/
rm -rf docs/_build/*

setup:
-poetry env remove --all
poetry install

update:
poetry update

format:
poetry run ruff format .

lint:
poetry run ruff check .

build:
poetry build

tests:
poetry run pytest -s -m "not slow and not manual"

tests-manual:
poetry run pytest -s -m "manual"

tests-slow:
poetry run pytest -s -m "slow and not manual"

tests-all:
poetry run pytest

docs:
$(MAKE) -C docs html
17 changes: 0 additions & 17 deletions Pipfile

This file was deleted.

Loading

0 comments on commit 1a0a17e

Please sign in to comment.