Skip to content

Commit 2c7ba3f

Browse files
reactive-firewallreactive-firewall
committed
Merge branch 'master' into stable
* master: - [x] Fixed minor bugs: - updated python 3.8 support - PR #28 - Update for travis CI config - PR #28 - Update for travis CI config (revert to working matrix) - Regression bug fix for python 3.3 support - Regression bug fix for #29 - added suport for pytest CI Testing - flake8 upgrade fix - Updated copyright year - posible fix for coverity scan - CI regression fixed by new config's path typo correction
2 parents 6579720 + cea2e61 commit 2c7ba3f

File tree

17 files changed

+312
-85
lines changed

17 files changed

+312
-85
lines changed

‎.appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ test_script:
4747
dir
4848
4949
make test-style || VER>NUL
50-
deploy: off
50+
deploy: off

‎.circleci/config.yml‎

Lines changed: 145 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
version: 2
22
jobs:
33
build:
4-
working_directory: ~/python-repo
54
docker:
65
- image: circleci/python:3.6.1
7-
environment:
8-
CI: cicleci
9-
DEBIAN_FRONTEND: noninteractive
10-
SHELL: /bin/bash
6+
- image: circleci/python:3.7
7+
- image: circleci/python:3.8
8+
environment:
9+
CI: cicleci
10+
DEBIAN_FRONTEND: noninteractive
11+
LANG: en_US.UTF-8
12+
LC_CTYPE: en_EN.UTF-8
13+
SHELL: /bin/bash
14+
working_directory: ~/python-repo
1115
steps:
1216
- checkout
1317
- run:
14-
shell: /bin/bash
1518
name: "fetch and pull"
1619
command: |
1720
git fetch && git pull --all || true
@@ -20,39 +23,172 @@ jobs:
2023
name: "install depends attempt"
2124
command: |
2225
python3 -m pip install --user -r ./requirements.txt || true
26+
when: on_success
2327
- run:
2428
shell: /bin/bash
2529
name: "install coverage attempt"
2630
command: |
2731
python3 -m pip install --user coverage || true
2832
- run:
29-
shell: /bin/bash
3033
name: "install flake8 attempt"
3134
command: |
3235
python3 -m pip install --user flake8 || true
36+
when: on_success
37+
- save_cache:
38+
key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
39+
paths:
40+
- ~/python-repo
41+
42+
test:
43+
docker:
44+
- image: circleci/python:3.6.1
45+
- image: circleci/python:3.7
46+
- image: circleci/python:3.8
47+
parallelism: 2
48+
environment:
49+
CI: cicleci
50+
DEBIAN_FRONTEND: noninteractive
51+
LANG: en_US.UTF-8
52+
LC_CTYPE: en_EN.UTF-8
53+
SHELL: /bin/bash
54+
working_directory: ~/python-repo
55+
steps:
56+
- restore_cache:
57+
key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
58+
- run:
59+
shell: /bin/bash
60+
name: "clean up for test"
61+
command: |
62+
python3 -m pip install --user coverage || true
63+
when: on_success
3364
- run:
3465
shell: /bin/bash
3566
name: "clean up for test"
3667
command: |
3768
make clean
69+
when: always
3870
- run:
3971
shell: /bin/bash
4072
name: "Unit Tests"
4173
command: |
4274
make test
75+
when: on_success
4376
- run:
4477
shell: /bin/bash
4578
name: "clean up from test"
4679
command: |
4780
make clean
81+
when: always
82+
- run:
83+
shell: /bin/bash
84+
name: "clean up from FAIL"
85+
command: |
86+
make clean
87+
when: on_fail
88+
89+
pytest:
90+
docker:
91+
- image: circleci/python:3.6.1
92+
- image: circleci/python:3.7
93+
- image: circleci/python:3.8
94+
parallelism: 2
95+
environment:
96+
CI: cicleci
97+
DEBIAN_FRONTEND: noninteractive
98+
LANG: en_US.UTF-8
99+
LC_CTYPE: en_EN.UTF-8
100+
SHELL: /bin/bash
101+
working_directory: ~/python-repo
102+
steps:
103+
- restore_cache:
104+
key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
105+
- run:
106+
shell: /bin/bash
107+
name: "clean up for test"
108+
command: |
109+
python3 -m pip install --user coverage || true
110+
when: on_success
111+
- run:
112+
shell: /bin/bash
113+
name: "setup up for pytest"
114+
command: |
115+
python3 -m pip install --user pytest || true
116+
when: on_success
117+
- run:
118+
shell: /bin/bash
119+
name: "clean up for pytest"
120+
command: |
121+
make clean
122+
when: always
123+
- run:
124+
shell: /bin/bash
125+
name: "pytest Unit Tests"
126+
command: |
127+
make test-pytest
128+
when: on_success
129+
- store_test_results:
130+
path: test-reports
131+
when: on_success
132+
- store_artifacts:
133+
path: test-reports
134+
when: on_success
135+
- run:
136+
shell: /bin/bash
137+
name: "clean up from pytest"
138+
command: |
139+
make clean
140+
when: always
141+
- run:
142+
shell: /bin/bash
143+
name: "clean up from FAIL"
144+
command: |
145+
make clean
146+
when: on_fail
147+
148+
lint:
149+
docker:
150+
- image: circleci/python:3.6.1
151+
environment:
152+
CI: cicleci
153+
DEBIAN_FRONTEND: noninteractive
154+
LANG: en_US.UTF-8
155+
SHELL: /bin/bash
156+
LC_CTYPE: en_EN.UTF-8
157+
working_directory: ~/python-repo
158+
steps:
159+
- restore_cache:
160+
key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
161+
- run:
162+
name: "install flake8 attempt"
163+
command: |
164+
python3 -m pip install --user flake8 || true
165+
- run:
166+
shell: /bin/bash
167+
name: "clean up for test"
168+
command: |
169+
make clean
48170
- run:
49171
shell: /bin/bash
50172
name: "check code style and spelling"
51173
command: |
52-
make test-style || python3 -m flake8 --ignore=W191,W391 --max-line-length=100 --verbose --count --config=.flake8.ini --max-complexity=15
174+
make test-style || python3 -m flake8 --ignore=W191,W391,E117 --max-line-length=100 --verbose --count --config=.flake8.ini --max-complexity=10
53175
- run:
54176
shell: /bin/bash
55177
name: "clean up when done"
56178
command: |
57179
make clean
58-
destination: build
180+
181+
workflows:
182+
version: 2
183+
workflow:
184+
jobs:
185+
- build
186+
- test:
187+
requires:
188+
- build
189+
- lint:
190+
requires:
191+
- build
192+
- pytest:
193+
requires:
194+
- build

‎.travis.yml‎

Lines changed: 49 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,23 @@ matrix:
3939
- os: linux
4040
python: "3.2"
4141
env: TRAVIS_PYTHON_VERSION="3.2"
42+
dist: trusty
4243
- os: linux
4344
python: "3.3"
4445
env: TRAVIS_PYTHON_VERSION="3.3"
46+
dist: trusty
4547
- os: linux
4648
python: "3.4"
49+
dist: xenial
4750
env: TRAVIS_PYTHON_VERSION="3.4"
4851
- os: linux
4952
python: "3.5"
5053
env: TRAVIS_PYTHON_VERSION="3.5"
5154
dist: trusty
55+
- os: linux
56+
python: "3.5"
57+
env: TRAVIS_PYTHON_VERSION="3.5"
58+
dist: xenial
5259
- os: linux
5360
python: "3.6"
5461
env: TRAVIS_PYTHON_VERSION="3.6"
@@ -61,64 +68,51 @@ matrix:
6168
- os: linux
6269
python: "3.7-dev"
6370
env: TRAVIS_PYTHON_VERSION="3.7"
71+
- os: linux
72+
python: "3.7"
73+
env: TRAVIS_PYTHON_VERSION="3.7"
6474
- os: linux
6575
python: "3.8-dev"
6676
env: TRAVIS_PYTHON_VERSION="3.8"
6777
- os: linux
6878
python: "pypy2.7-5.8.0"
79+
dist: xenial
6980
- os: linux
7081
python: "pypy3.5-5.8.0"
82+
dist: xenial
7183
- os: linux
7284
python: "pypy3.5-6.0"
85+
dist: xenial
7386
- os: linux
7487
python: "pypy3.5-5.10.0"
7588
env: TRAVIS_PYTHON_VERSION="3.5"
89+
dist: xenial
7690
- os: linux
7791
python: "pypy2.7-5.10.0"
7892
env: TRAVIS_PYTHON_VERSION="2.7"
93+
dist: xenial
7994
- os: linux
80-
python: "nightly" # currently points to 3.7-dev
81-
env: TRAVIS_PYTHON_VERSION="3.7-dev"
82-
- os: osx
83-
osx_image: xcode7.2
84-
language: generic
85-
- os: osx
86-
osx_image: xcode7.3
87-
language: generic
88-
- os: osx
89-
osx_image: xcode8
90-
language: generic
91-
- os: osx
92-
osx_image: xcode8.3
93-
language: generic
94-
- os: osx
95-
osx_image: xcode9
96-
language: generic
97-
- os: osx
98-
osx_image: xcode9.2
99-
language: generic
100-
- os: osx
101-
osx_image: xcode9.3
102-
language: generic
103-
- os: osx
104-
osx_image: xcode9.4
105-
language: generic
95+
python: "nightly" # currently points to 3.8-dev
96+
env: TRAVIS_PYTHON_VERSION="3.8-dev"
10697
- os: osx
10798
osx_image: xcode10
108-
language: generic
99+
language: shell
100+
- os: osx
101+
osx_image: xcode11
102+
language: shell
109103
allow_failures:
110104
- os: linux
111105
python: "nightly" # currently points to 3.7-dev
112106
env: TRAVIS_PYTHON_VERSION="3.7-dev"
113107
- os: osx
114108
osx_image: xcode6.4
115-
language: generic
109+
language: shell
116110
- os: osx
117111
osx_image: xcode7.2
118-
language: generic
112+
language: shell
119113
- os: osx
120114
osx_image: xcode7.3
121-
language: generic
115+
language: shell
122116
- os: linux
123117
python: "2.6"
124118
- os: linux
@@ -153,6 +147,31 @@ matrix:
153147
- os: linux
154148
python: "nightly" # currently points to 3.7-dev
155149
env: TRAVIS_PYTHON_VERSION="3.7-dev"
150+
- os: osx
151+
osx_image: xcode7.2
152+
language: shell
153+
- os: osx
154+
osx_image: xcode7.3
155+
language: shell
156+
- os: osx
157+
osx_image: xcode8
158+
language: shell
159+
- os: osx
160+
osx_image: xcode8.3
161+
language: shell
162+
- os: osx
163+
osx_image: xcode9
164+
language: shell
165+
- os: osx
166+
osx_image: xcode9.2
167+
language: shell
168+
- os: osx
169+
osx_image: xcode9.3
170+
language: shell
171+
- os: osx
172+
osx_image: xcode9.4
173+
language: shell
174+
156175

157176
install: "make init"
158177

‎LICENSE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
License - MIT
22

3-
Copyright (c) 2017 Mr. Walls
3+
Copyright (c) 2017-2020 Mr. Walls
44

55
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
66
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

0 commit comments

Comments
 (0)