Skip to content

Commit

Permalink
Merge pull request #94 from xethorn/xethorn/20-may-remove-python27
Browse files Browse the repository at this point in the history
Remove support for python 2.7.
  • Loading branch information
xethorn committed May 10, 2020
2 parents 845d419 + e5db053 commit efef1a4
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 42 deletions.
6 changes: 2 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Lightweight library for AWS SWF.
Requirements
~~~~~~~~~~~~

- Python 2.7, 3.4, 3.5, 3.6, 3.7 (tested)
- Python 3.5, 3.6, 3.7, 3.8 (tested)
- Boto3 (tested)

Goal
Expand All @@ -33,8 +33,6 @@ be completed.

.. code:: python
from __future__ import print_function
import boto3
from garcon import activity
from garcon import runner
Expand Down Expand Up @@ -87,7 +85,7 @@ Application architecture
Contributors
~~~~~~~~~~~~

- Michael Ortali
- Michael Ortali (Author)
- Adam Griffiths
- Raphael Antonmattei
- John Penner
Expand Down
4 changes: 1 addition & 3 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Lightweight library for AWS SWF.
Requirements
------------

* Python 2.7, 3.4 (tested)
* Python 3.5, 3.6, 3.7, 3.8 (tested)
* Boto 2.34.0 (tested)


Expand All @@ -20,8 +20,6 @@ Code sample

The code sample shows a workflow that has 4 activities. It starts with activity_1, which after being completed schedule activity_2 and activity_3 to be ran in parallel. The workflow ends after the completion of activity_4 which requires activity_2 and activity_3 to be completed::

from __future__ import print_function

from garcon import activity
from garcon import runner

Expand Down
3 changes: 0 additions & 3 deletions requirements-py2.txt

This file was deleted.

2 changes: 0 additions & 2 deletions tests/fixtures/flows/example.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import print_function

from garcon import activity
from garcon import runner

Expand Down
15 changes: 5 additions & 10 deletions tests/test_activity.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
from __future__ import absolute_import
from __future__ import print_function
try:
from unittest.mock import MagicMock
from unittest.mock import ANY
except:
from mock import MagicMock
from mock import ANY
from botocore import exceptions
from unittest.mock import MagicMock
from unittest.mock import ANY
import json
import pytest
import sys

from botocore import exceptions
import pytest

from garcon import activity
from garcon import event
from garcon import runner
Expand Down
6 changes: 1 addition & 5 deletions tests/test_context.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
from __future__ import absolute_import
try:
from unittest.mock import MagicMock
except:
from mock import MagicMock
from unittest.mock import MagicMock

from garcon import context
from tests.fixtures import decider as decider_events
Expand Down
7 changes: 2 additions & 5 deletions tests/test_decider.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
from __future__ import absolute_import
try:
from unittest.mock import MagicMock
except:
from mock import MagicMock
from unittest.mock import MagicMock
import json

import pytest

from garcon import decider
Expand Down
6 changes: 1 addition & 5 deletions tests/test_runner.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
from __future__ import absolute_import
try:
from unittest.mock import MagicMock
except:
from mock import MagicMock
from unittest.mock import MagicMock

import pytest

Expand Down
6 changes: 1 addition & 5 deletions tests/test_task.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
from __future__ import absolute_import
import functools
try:
from unittest.mock import MagicMock
except:
from mock import MagicMock
from unittest.mock import MagicMock

import pytest

Expand Down

0 comments on commit efef1a4

Please sign in to comment.