Skip to content

Commit

Permalink
Merge branch 'master' into crypto/no-fail-on-decoded-message
Browse files Browse the repository at this point in the history
  • Loading branch information
seba-aln authored Nov 27, 2023
2 parents c5c0194 + 5164d88 commit 51a486f
Show file tree
Hide file tree
Showing 8 changed files with 46 additions and 54 deletions.
10 changes: 4 additions & 6 deletions .github/workflows/commands-handler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,11 @@ jobs:
process:
name: Process command
if: github.event.issue.pull_request && endsWith(github.repository, '-private') != true
runs-on:
group: Default Larger Runners
labels: ubuntu-latest-m
runs-on: ubuntu-latest
steps:
- name: Check referred user
id: user-check
env:
env:
CLEN_BOT: ${{ secrets.CLEN_BOT }}
run: echo "expected-user=${{ startsWith(github.event.comment.body, format('@{0} ', env.CLEN_BOT)) }}" >> $GITHUB_OUTPUT
- name: Regular comment
Expand All @@ -27,7 +25,7 @@ jobs:
if: steps.user-check.outputs.expected-user == 'true'
uses: actions/checkout@v3
with:
token: ${{ secrets.GH_TOKEN }}
token: ${{ secrets.GH_TOKEN }}
- name: Checkout release actions
if: steps.user-check.outputs.expected-user == 'true'
uses: actions/checkout@v3
Expand All @@ -42,4 +40,4 @@ jobs:
with:
token: ${{ secrets.GH_TOKEN }}
listener: ${{ secrets.CLEN_BOT }}
jira-api-key: ${{ secrets.JIRA_API_KEY }}
jira-api-key: ${{ secrets.JIRA_API_KEY }}
13 changes: 4 additions & 9 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,13 @@ name: Automated product release

on:
pull_request:
branches: [ master ]
types: [ closed ]

branches: [master]
types: [closed]

jobs:
check-release:
name: Check release required
runs-on:
group: Default Larger Runners
labels: ubuntu-latest-m
runs-on: ubuntu-latest
if: github.event.pull_request.merged && endsWith(github.repository, '-private') != true
outputs:
release: ${{ steps.check.outputs.ready }}
Expand All @@ -30,9 +27,7 @@ jobs:
token: ${{ secrets.GH_TOKEN }}
publish:
name: Publish package
runs-on:
group: Default Larger Runners
labels: ubuntu-latest-m
runs-on: ubuntu-latest
needs: check-release
if: needs.check-release.outputs.release == 'true'
steps:
Expand Down
32 changes: 13 additions & 19 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ env:
jobs:
tests:
name: Integration and Unit tests
runs-on:
group: Default Larger Runners
labels: ubuntu-latest-m
runs-on: ubuntu-latest
strategy:
fail-fast: true
matrix:
Expand Down Expand Up @@ -52,9 +50,7 @@ jobs:
uses: ./.github/.release/actions/actions/utils/fast-jobs-failure
acceptance-tests:
name: Acceptance tests
runs-on:
group: Default Larger Runners
labels: ubuntu-latest-m
runs-on: ubuntu-latest
steps:
- name: Checkout project
uses: actions/checkout@v3
Expand All @@ -68,23 +64,23 @@ jobs:
- name: Setup Python 3.9
uses: actions/setup-python@v4
with:
python-version: '3.9.13'
python-version: "3.9.13"
- name: Run mock server action
uses: ./.github/.release/actions/actions/mock-server
with:
token: ${{ secrets.GH_TOKEN }}
- name: Install Python dependencies and run acceptance tests
run: |
cp sdk-specifications/features/access/authorization-failure-reporting.feature tests/acceptance/pam
cp sdk-specifications/features/access/grant-token.feature tests/acceptance/pam
cp sdk-specifications/features/access/revoke-token.feature tests/acceptance/pam
cp sdk-specifications/features/encryption/cryptor-module.feature tests/acceptance/encryption
mkdir tests/acceptance/encryption/assets/
cp sdk-specifications/features/encryption/assets/* tests/acceptance/encryption/assets/
cp sdk-specifications/features/access/authorization-failure-reporting.feature tests/acceptance/pam
cp sdk-specifications/features/access/grant-token.feature tests/acceptance/pam
cp sdk-specifications/features/access/revoke-token.feature tests/acceptance/pam
cp sdk-specifications/features/encryption/cryptor-module.feature tests/acceptance/encryption
mkdir tests/acceptance/encryption/assets/
cp sdk-specifications/features/encryption/assets/* tests/acceptance/encryption/assets/
sudo pip3 install -r requirements-dev.txt
behave --junit tests/acceptance/pam
behave --junit tests/acceptance/encryption/cryptor-module.feature -t=~na=python -k
sudo pip3 install -r requirements-dev.txt
behave --junit tests/acceptance/pam
behave --junit tests/acceptance/encryption/cryptor-module.feature -t=~na=python -k
- name: Expose acceptance tests reports
uses: actions/upload-artifact@v3
if: always()
Expand All @@ -97,9 +93,7 @@ jobs:
uses: ./.github/.release/actions/actions/utils/fast-jobs-failure
all-tests:
name: Tests
runs-on:
group: Default Larger Runners
labels: ubuntu-latest-m
runs-on: ubuntu-latest
needs: [tests, acceptance-tests]
steps:
- name: Tests summary
Expand Down
18 changes: 6 additions & 12 deletions .github/workflows/run-validations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,24 @@ on: [push]
jobs:
lint:
name: Lint project
runs-on:
group: Default Larger Runners
labels: ubuntu-latest-m
runs-on: ubuntu-latest
steps:
- name: Checkout project
uses: actions/checkout@v3
- name: Setup Python 3.11
uses: actions/setup-python@v4
with:
python-version: '3.11'
python-version: "3.11"
- name: Install Python dependencies and run acceptance tests
run: |
sudo pip3 install -r requirements-dev.txt
flake8 --exclude=scripts/,src/,.cache,.git,.idea,.tox,._trial_temp/,venv/ --ignore F811,E402
sudo pip3 install -r requirements-dev.txt
flake8 --exclude=scripts/,src/,.cache,.git,.idea,.tox,._trial_temp/,venv/ --ignore F811,E402
- name: Cancel workflow runs for commit on error
if: failure()
uses: ./.github/.release/actions/actions/utils/fast-jobs-failure
pubnub-yml:
name: "Validate .pubnub.yml"
runs-on:
group: Default Larger Runners
labels: ubuntu-latest-m
runs-on: ubuntu-latest
steps:
- name: Checkout project
uses: actions/checkout@v3
Expand All @@ -46,9 +42,7 @@ jobs:
uses: ./.github/.release/actions/actions/utils/fast-jobs-failure
all-validations:
name: Validations
runs-on:
group: Default Larger Runners
labels: ubuntu-latest-m
runs-on: ubuntu-latest
needs: [pubnub-yml, lint]
steps:
- name: Validations summary
Expand Down
13 changes: 9 additions & 4 deletions .pubnub.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: python
version: 7.3.0
version: 7.3.1
schema: 1
scm: github.com/pubnub/python
sdks:
Expand All @@ -18,7 +18,7 @@ sdks:
distributions:
- distribution-type: library
distribution-repository: package
package-name: pubnub-7.3.0
package-name: pubnub-7.3.1
location: https://pypi.org/project/pubnub/
supported-platforms:
supported-operating-systems:
Expand Down Expand Up @@ -97,8 +97,8 @@ sdks:
-
distribution-type: library
distribution-repository: git release
package-name: pubnub-7.3.0
location: https://github.com/pubnub/python/releases/download/v7.3.0/pubnub-7.3.0.tar.gz
package-name: pubnub-7.3.1
location: https://github.com/pubnub/python/releases/download/v7.3.1/pubnub-7.3.1.tar.gz
supported-platforms:
supported-operating-systems:
Linux:
Expand Down Expand Up @@ -169,6 +169,11 @@ sdks:
license-url: https://github.com/aio-libs/aiohttp/blob/master/LICENSE.txt
is-required: Required
changelog:
- date: 2023-10-30
version: v7.3.1
changes:
- type: bug
text: "Changed license type from MIT to PubNub Software Development Kit License."
- date: 2023-10-16
version: v7.3.0
changes:
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## v7.3.1
October 30 2023

#### Fixed
- Changed license type from MIT to PubNub Software Development Kit License.

## v7.3.0
October 16 2023

Expand Down
2 changes: 1 addition & 1 deletion pubnub/pubnub_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@

class PubNubCore:
"""A base class for PubNub Python API implementations"""
SDK_VERSION = "7.3.0"
SDK_VERSION = "7.3.1"
SDK_NAME = "PubNub-Python"

TIMESTAMP_DIVIDER = 1000
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setup(
name='pubnub',
version='7.3.0',
version='7.3.1',
description='PubNub Real-time push service in the cloud',
author='PubNub',
author_email='[email protected]',
Expand All @@ -12,7 +12,7 @@
'Documentation': 'https://www.pubnub.com/docs/sdks/python',
},
packages=find_packages(exclude=("examples*", 'tests*')),
license='MIT',
license='PubNub Software Development Kit License',
classifiers=(
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
Expand All @@ -22,7 +22,7 @@
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: Implementation :: CPython',
'License :: OSI Approved :: MIT License',
'License :: Other/Proprietary License',
'Operating System :: OS Independent',
'Topic :: Internet :: WWW/HTTP',
'Topic :: Software Development :: Libraries :: Python Modules',
Expand Down

0 comments on commit 51a486f

Please sign in to comment.