Skip to content
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
50 changes: 25 additions & 25 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,61 +8,61 @@ on:

jobs:
lint-pydocstyle:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: "3.10.15"

- name: Check compliance with Python docstring conventions
run: |
pip install pydocstyle
./run-tests.sh --check-pydocstyle

lint-flake8:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: "3.10.15"

- name: Check compliance with pep8, pyflakes and circular complexity
run: |
pip install flake8
./run-tests.sh --check-flake8

lint-check-manifest:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: "3.10.15"

- name: Check Python manifest completeness
run: |
pip install check-manifest
./run-tests.sh --check-manifest

python-unit-tests:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [2.7, 3.8]
python-version: ["3.10.15"]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -75,20 +75,20 @@ jobs:
run: ./run-tests.sh --check-pytest-unit

- name: Codecov Coverage
if: matrix.python-version == 3.8
uses: codecov/codecov-action@v1
if: ${{ matrix.python-version == '3.10.15' }}
uses: codecov/codecov-action@v5
with:
files: coverage.xml

python-e2e-vcr-tests:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: "3.10.15"

- name: Install Python dependencies
run: |
Expand All @@ -97,6 +97,6 @@ jobs:

- name: Run pytest
env:
TESTS_SERVER_HOST: 'https://localhost'
TEST_E2E_TOKEN: 'token'
TESTS_SERVER_HOST: "https://localhost"
TEST_E2E_TOKEN: "token"
run: ./run-tests.sh --check-pytest-e2e-vcr
4 changes: 2 additions & 2 deletions .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
Publish:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest

steps:
- name: Checkout
Expand All @@ -16,7 +16,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.9
python-version: 3.10

- name: Install dependencies
run: pip install setuptools wheel
Expand Down
2 changes: 1 addition & 1 deletion cap_client/api/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import requests
import urllib3
from click import UsageError
from future.moves.urllib.parse import urljoin
from urllib.parse import urljoin

from cap_client.errors import BadStatusCode

Expand Down
2 changes: 1 addition & 1 deletion run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ check_manifest () {
}

check_pytest_unit () {
python setup.py test
pytest tests/unit --cov=cap_client --cov-report=xml
}

check_pytest_e2e () {
Expand Down
38 changes: 16 additions & 22 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,22 @@
history = open('CHANGES.rst').read()

tests_require = [
'check-manifest>=0.25',
'coverage>=4.0',
'mock>=2.0.0',
'pydocstyle>=1.0.0',
'check-manifest>=0.51',
'coverage>=7.13.5',
'mock>=5.2.0',
'pydocstyle>=6.3.0',
'pytest-cache>=1.0',
'pytest-cov>=1.8.0',
'flake8',
'pytest>=2.8.0',
'responses>=0.10.6',
'pytest-vcr',
'pytest-cov>=7.0.0',
'flake8>=7.3.0',
'pytest>=9.0.2',
'responses>=0.26.0',
'pytest-vcr>=1.0.2',
]

extras_require = {
'docs': [
'Sphinx>=1.4.4',
'sphinx-rtd-theme>=0.1.9',
'Sphinx>=7.2.0',
'sphinx-rtd-theme>=2.0.0',
],
'tests': tests_require,
}
Expand All @@ -58,16 +58,12 @@
continue
extras_require['all'].extend(reqs)

setup_requires = [
'pytest-runner>=2.7',
]

install_requires = [
'click>=6.7',
'click-help-colors>=0.8',
'requests>=2.18.4',
'colorama>=0.4.3',
'future>=0.16.0',
'click>=8.3.1',
'click-help-colors>=0.9.4',
'requests>=2.32.5',
'colorama>=0.4.6',
'future>=1.0.0',
]

packages = find_packages()
Expand All @@ -94,8 +90,6 @@
},
install_requires=install_requires,
extras_require=extras_require,
setup_requires=setup_requires,
tests_require=tests_require,
classifiers=[
'Environment :: Web Environment',
'Intended Audience :: Developers',
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/test_files_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ def test_files_upload_file(runner):

res = runner.run("files upload -p some-pid dir/file.txt")

assert responses.calls[1].request.body.name == 'dir/file.txt'
assert responses.calls[1].request.body == b'Hello world'
assert res.exit_code == 0
assert res.stripped_output == 'File uploaded successfully.'

Expand Down
Loading