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
20 changes: 10 additions & 10 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ jobs:
command: pip install --user setuptools tox==2.9.1 tox-virtualenv-no-download

- restore_cache:
key: tox-v2-py27-{{ checksum "tox.ini" }}
key: tox-v2-py27-{{ checksum "tox.ini" }}-({ checksum "Pipfile.lock" })

- run:
name: Install tox things
command: if [ ! -d ".tox" ]; then python -m tox -e py27 --notest; fi

- save_cache:
key: tox-v2-py27-{{ checksum "tox.ini" }}
key: tox-v2-py27-{{ checksum "tox.ini" }}-({ checksum "Pipfile.lock" })
paths:
- .tox

Expand Down Expand Up @@ -82,14 +82,14 @@ jobs:
command: pip install --user setuptools tox==2.9.1 tox-virtualenv-no-download

- restore_cache:
key: tox-v2-py3-{{ checksum "tox.ini" }}
key: tox-v2-py3-{{ checksum "tox.ini" }}-({ checksum "Pipfile.lock" })

- run:
name: Install tox things
command: if [ ! -d ".tox" ]; then python -m tox -e py3 --notest; fi

- save_cache:
key: tox-v2-py3-{{ checksum "tox.ini" }}
key: tox-v2-py3-{{ checksum "tox.ini" }}-({ checksum "Pipfile.lock" })
paths:
- .tox

Expand All @@ -114,14 +114,14 @@ jobs:
command: pip install --user setuptools tox==2.9.1 tox-virtualenv-no-download

- restore_cache:
key: tox-v2-mypy27-{{ checksum "tox.ini" }}
key: tox-v2-mypy27-{{ checksum "tox.ini" }}-({ checksum "Pipfile.lock" })

- run:
name: Install tox things
command: if [ ! -d ".tox" ]; then python -m tox -e mypy27 --notest; fi

- save_cache:
key: tox-v2-mypy27-{{ checksum "tox.ini" }}
key: tox-v2-mypy27-{{ checksum "tox.ini" }}-({ checksum "Pipfile.lock" })
paths:
- .tox

Expand All @@ -146,14 +146,14 @@ jobs:
command: pip install --user setuptools tox==2.9.1 tox-virtualenv-no-download

- restore_cache:
key: tox-v2-mypy3-{{ checksum "tox.ini" }}
key: tox-v2-mypy3-{{ checksum "tox.ini" }}-({ checksum "Pipfile.lock" })

- run:
name: Install tox things
command: if [ ! -d ".tox" ]; then python -m tox -e mypy3 --notest; fi

- save_cache:
key: tox-v2-mypy3-{{ checksum "tox.ini" }}
key: tox-v2-mypy3-{{ checksum "tox.ini" }}-({ checksum "Pipfile.lock" })
paths:
- .tox

Expand All @@ -178,14 +178,14 @@ jobs:
command: pip install --user setuptools tox==2.9.1 tox-virtualenv-no-download

- restore_cache:
key: tox-v2-lint-{{ checksum "tox.ini" }}
key: tox-v2-lint-{{ checksum "tox.ini" }}-({ checksum "Pipfile.lock" })

- run:
name: Install tox things
command: if [ ! -d ".tox" ]; then python -m tox -e lint --notest; fi

- save_cache:
key: tox-v2-lint-{{ checksum "tox.ini" }}
key: tox-v2-lint-{{ checksum "tox.ini" }}-({ checksum "Pipfile.lock" })
paths:
- .tox

Expand Down
1 change: 1 addition & 0 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ name = "pypi"

[packages]
"enum34" = "*"
future = "*"
requests = "*"
typing = "*"

Expand Down
122 changes: 64 additions & 58 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions conjure_python_client/_http/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
# limitations under the License.

from .configuration import SslConfiguration, ServiceConfiguration
from .requests_client import RequestsClient, Service
from .requests_client import RequestsClient, Service, ConjureHTTPError

__all__ = [
'SslConfiguration', 'ServiceConfiguration', 'RequestsClient', 'Service'
'SslConfiguration', 'ServiceConfiguration', 'RequestsClient', 'Service',
'ConjureHTTPError'
]
Loading