Skip to content

Commit

Permalink
Merge tag '0.23.1'
Browse files Browse the repository at this point in the history
0.23.1
  • Loading branch information
David Sternlicht committed Apr 12, 2020
2 parents ab4f06e + ee449de commit ca081e7
Show file tree
Hide file tree
Showing 39 changed files with 914 additions and 503 deletions.
11 changes: 7 additions & 4 deletions .github/workflows/ci-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@ jobs:
with:
python-version: ${{ matrix.python_version }}
- name: Install requirements
run: pip install -e . -r tests/requirements.txt -r unittests/requirements.txt pylint
- name: Check with pylint
run: pylint scottypy tests unittests
run: pip install -e . -r unittests/requirements.txt pylint mypy
- name: Format
if: matrix.python_version == '3.8'
run: pip install black isort && make format
- name: Lint
run: make lint
- name: Unittest
run: pytest unittests
run: make test
31 changes: 31 additions & 0 deletions .github/workflows/pythonpublish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# This workflows will upload a Python Package using Twine when a release is created
# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries

name: Upload Python Package

on:
release:
types: [created]

jobs:
deploy:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v1
with:
python-version: '3.x'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools wheel twine
- name: Build and publish
env:
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
run: |
python setup.py sdist bdist_wheel
twine upload dist/*
2 changes: 1 addition & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[MESSAGES CONTROL]
disable=R,broad-except,protected-access,unused-argument,redefined-builtin,missing-docstring,invalid-name,ungrouped-imports,wrong-import-order
disable=R,broad-except,protected-access,unused-argument,redefined-builtin,missing-docstring,invalid-name,ungrouped-imports,wrong-import-order,bad-continuation

[FORMAT]
max-line-length=150
Expand Down
19 changes: 19 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
default: check


format:
isort -c -rc scottypy unittests
black --check scottypy unittests

do_format:
isort -rc scottypy unittests
black scottypy unittests

test:
pytest unittests/

lint:
MYPYPATH=stubs mypy scottypy --strict
pylint --rcfile .pylintrc -j $(shell nproc) scottypy unittests

check: format lint test
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ git push origin : --tags

## ChangeLog

### 0.23.1

* Provide more information on exceptions
* Add type hinting
* Fix bug with downloading windows paths on linux

### 0.22.1

* Fix bug with prefetch and then beam up without explicitly setting version
Expand Down
4 changes: 2 additions & 2 deletions scottypy/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .scotty import Scotty
from .file import File
from .beam import Beam
from .exc import NotOverwriting
from .file import File
from .scotty import Scotty
2 changes: 1 addition & 1 deletion scottypy/__version__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.22.1"
__version__ = "0.23.1"
Loading

0 comments on commit ca081e7

Please sign in to comment.