Skip to content

Commit 6c5665d

Browse files
mohierfmohierf
authored
Merge pull request #1019 from Alignak-monitoring/python3
Python3 compatibility and other improvements
2 parents b338d86 + e402941 commit 6c5665d

File tree

1,945 files changed

+100592
-71211
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,945 files changed

+100592
-71211
lines changed

‎.bintray-deb.json

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"package": {
3+
"name": "sed_package_name",
4+
"repo": "sed_version_repo",
5+
"subject": "alignak",
6+
"desc": "Alignak monitoring framework",
7+
"vcs_url": "https://github.com/Alignak-monitoring/alignak.git",
8+
"website_url": "http://alignak.net",
9+
"issue_tracker_url": "https://github.com/Alignak-monitoring/alignak/issues",
10+
"labels": ["alignak", "nagios", "monitoring"],
11+
"licenses": ["AGPL-V3"]
12+
},
13+
"version": {
14+
"name": "sed_version_name",
15+
"desc": "sed_version_desc",
16+
"released": "sed_version_released"
17+
},
18+
"files": [
19+
{
20+
"includePattern": "./dist/(.*\\.deb)",
21+
"uploadPattern": "$1",
22+
"matrixParams": {
23+
"override": 1,
24+
"deb_distribution": "jessie,Stretch,Trusty,xenial,Yakkety,Zesty,Artful",
25+
"deb_component": "main",
26+
"deb_architecture": "all"
27+
}
28+
}
29+
],
30+
"publish": true
31+
}

‎.bintray-freebsd.json

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"package": {
3+
"name": "sed_package_name",
4+
"repo": "sed_version_repo",
5+
"subject": "alignak",
6+
"desc": "Alignak monitoring framework",
7+
"vcs_url": "https://github.com/Alignak-monitoring/alignak.git",
8+
"website_url": "http://alignak.net",
9+
"issue_tracker_url": "https://github.com/Alignak-monitoring/alignak/issues",
10+
"labels": ["alignak", "nagios", "monitoring"],
11+
"licenses": ["AGPL-V3"]
12+
},
13+
"version": {
14+
"name": "sed_version_name",
15+
"desc": "sed_version_desc",
16+
"released": "sed_version_released"
17+
},
18+
"files": [
19+
{
20+
"includePattern": "./dist/(.*\\.txz)",
21+
"uploadPattern": "$1",
22+
"matrixParams": {
23+
"override": 1
24+
}
25+
}
26+
],
27+
"publish": true
28+
}

‎.bintray-rpm.json

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"package": {
3+
"name": "sed_package_name",
4+
"repo": "sed_version_repo",
5+
"subject": "alignak",
6+
"desc": "Alignak monitoring framework",
7+
"vcs_url": "https://github.com/Alignak-monitoring/alignak.git",
8+
"website_url": "http://alignak.net",
9+
"issue_tracker_url": "https://github.com/Alignak-monitoring/alignak/issues",
10+
"labels": ["alignak", "nagios", "monitoring"],
11+
"licenses": ["AGPL-V3"]
12+
},
13+
"version": {
14+
"name": "sed_version_name",
15+
"desc": "sed_version_desc",
16+
"released": "sed_version_released"
17+
},
18+
"files": [
19+
{
20+
"includePattern": "./dist/(.*\\.rpm)",
21+
"uploadPattern": "$1",
22+
"matrixParams": {
23+
"override": 1
24+
}
25+
}
26+
],
27+
"publish": true
28+
}

‎.bintray.json

-25
This file was deleted.

‎.gitignore

+4-11
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ Thumbs.db
3333
\#*#
3434

3535
*.debug
36-
*pack_distribution.dat
37-
test/tmp/*dat
38-
env/
3936

4037
# Documentation #
4138
#################
@@ -45,12 +42,8 @@ docs/tools/pages/
4542

4643

4744
# test and coverage
48-
test/.coverage
49-
test/.coverage.*
50-
51-
test/run/
52-
test_run/run/
53-
54-
# Pbr
55-
pbr-*.egg/
45+
tests/.coverage
46+
tests/.coverage.*
5647

48+
tests_integ/.coverage
49+
tests_integ/.coverage.*

‎.landscape.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ ignore-paths:
2020
- doc
2121
- etc
2222
- test
23+
- test_load
24+
- test_run
2325
ignore-patterns:
2426
# This file is only defining the imported Alignak version
2527
- alignak/__init__.py
2628
# This file is necessary because imported by daemons but it does not use imported packages...
2729
- alignak/objects/__init__.py
28-
# This file is for setup only and not yet pep8/pylint compliant
29-
- install_hooks.py

0 commit comments

Comments
 (0)