Skip to content

Commit 598158d

Browse files
committed
Merge branch 'release/1.0.0'
2 parents 248d9ba + 2051d8a commit 598158d

13 files changed

Lines changed: 144 additions & 132 deletions

.travis.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1+
dist: xenial
12
language: python
2-
3-
sudo: false
4-
53
python:
6-
- "2.7"
4+
- "3.7"
5+
6+
before_install: sudo rm /etc/boto.cfg
77

8-
install: pip install --use-mirrors flake8
8+
install: pip install flake8 black
99

10-
before_script: flake8 .
10+
before_script:
11+
- flake8 .
12+
- black --check .
1113

1214
script: python setup.py test
1315

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 1.0.0
2+
3+
- Added Python 3 support (only Python 3.7 tested).
4+
- Removed Python 2 support.
5+
16
## 0.2.1
27

38
- Forgot to bump version in `setup.py`.

Dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
FROM python:2.7.9
1+
FROM python:3-slim
22

3-
ADD . /app
3+
RUN mkdir -p /usr/src/app
4+
WORKDIR /usr/src/app
45

5-
WORKDIR /app
6+
COPY . /usr/src/app
67

7-
RUN python2 setup.py develop
8+
RUN python setup.py develop

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
same "printed page" as the copyright notice for easier
188188
identification within third-party archives.
189189

190-
Copyright 2015 Azavea Inc.
190+
Copyright 2019 Azavea Inc.
191191

192192
Licensed under the Apache License, Version 2.0 (the "License");
193193
you may not use this file except in compliance with the License.

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ There are two ways to run the built-in test suite. One is intended to be run loc
88

99
### Local
1010

11-
The local tests require a working installation of Python 2.7:
11+
The local tests require a working installation of Python 3:
1212

1313
```bash
14-
$ python setup.py test
14+
$ python3 setup.py test
1515
```
1616

1717
### Docker
1818

19-
The Docker setup builds an image with Python 2.7 installed, along with all of this project's dependencies. Build the image and launch the container with [`docker-compose`](https://docs.docker.com/compose/):
19+
The Docker setup builds an image with Python 3 installed, along with all of this project's dependencies. Build the image and launch the container with Docker Compose:
2020

2121
```bash
2222
$ docker-compose build majorkirby

docker-compose.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,9 @@
1-
majorkirby:
2-
build: .
1+
version: '3'
2+
services:
3+
majorkirby:
4+
build:
5+
context: .
6+
dockerfile: Dockerfile
7+
volumes:
8+
- .:/usr/src/app
9+
command: bash

majorkirby/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
MKNoSuchInputError,
77
StackNode,
88
GlobalConfigNode,
9-
CustomActionNode
9+
CustomActionNode,
1010
)

0 commit comments

Comments
 (0)