afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed logging changes to be python2 compatible, small change to Pipfile to support possibility of installing to python2, but python3 required for dev

Browse source
This commit is contained in:
bharnden 2019-09-11 10:59:06 -07:00
parent 0683ea3c22
commit 58471b168b
5 changed files with 14 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
daemon/Pipfile
View file

@ -8,7 +8,6 @@ coredev = "python scripts/core-daemon -f data/core.conf -l data/logging.conf"
[dev-packages]
grpcio-tools = "*"
core = {editable = true,path = "."}
isort = "*"
pre-commit = "*"
flake8 = "*"
@ -17,10 +16,4 @@ pytest = "*"
mock = "*"
[packages]
configparser = "*"
enum34 = {markers = "python_version < '3.4'"}
future = "*"
futures = {markers = "python_version < '3.2'"}
grpcio = "*"
lxml = "*"
protobuf = "*"
core = {editable = true,path = "."}

84
daemon/Pipfile.lock generated
View file

@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
"sha256": "7bbe8f754e71f84d32e9ef7d33b595e3c70011f1d871a2f702167d10326ce6a2"
"sha256": "d702e6eed5a1362bf261543572bbffd2e8a87140b8d8cb07b99fb0d25220a2b5"
},
"pipfile-spec": 6,
"requires": {},
@ -19,36 +19,18 @@
"sha256:296a9c0d0607f689f2a262d4ca3fa2b22146ac0acb07fd281125c86dee3bcf50",
"sha256:5e4c0d9de6ffc76f625eda1f5e28cec0700aed7cdacfe5070964df002ac02fec"
],
"index": "pypi",
"version": "==4.0.1"
},
"enum34": {
"hashes": [
"sha256:2d81cbbe0e73112bdfe6ef8576f2238f2ba27dd0d55752a776c41d38b7da2850",
"sha256:644837f692e5f550741432dd3f223bbb9852018674981b1664e5dc339387588a",
"sha256:6bd0f6ad48ec2aa117d3d141940d484deccda84d4fcd884f5c3d93c23ecd8c79",
"sha256:8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1"
],
"index": "pypi",
"markers": "python_version < '3.4'",
"version": "==1.1.6"
"core": {
"editable": true,
"path": "."
},
"future": {
"hashes": [
"sha256:67045236dcfd6816dc439556d009594abf643e5eb48992e36beac09c2ca659b8"
],
"index": "pypi",
"version": "==0.17.1"
},
"futures": {
"hashes": [
"sha256:51ecb45f0add83c806c68e4b06106f90db260585b25ef2abfcda0bd95c0132fd",
"sha256:c4884a65654a7c45435063e14ae85280eb1f111d94e542396717ba9828c4337f"
],
"index": "pypi",
"markers": "python_version < '3.2'",
"version": "==3.1.1"
},
"grpcio": {
"hashes": [
"sha256:1303578092f1f6e4bfbc354c04ac422856c393723d3ffa032fff0f7cb5cfd693",
@ -84,7 +66,6 @@
"sha256:f71693c3396530c6b00773b029ea85e59272557e9bd6077195a6593e4229892a",
"sha256:f79f7455f8fbd43e8e9d61914ecf7f48ba1c8e271801996fef8d6a8f3cc9f39f"
],
"index": "pypi",
"version": "==1.23.0"
},
"lxml": {
@ -112,7 +93,6 @@
"sha256:e9c028b5897901361d81a4718d1db217b716424a0283afe9d6735fe0caf70f79",
"sha256:fe489d486cd00b739be826e8c1be188ddb74c7a1ca784d93d06fda882a6a1681"
],
"index": "pypi",
"version": "==4.4.1"
},
"protobuf": {
@ -134,7 +114,6 @@
"sha256:eabc4cf1bc19689af8022ba52fd668564a8d96e0d08f3b4732d26a64255216a4",
"sha256:fcff6086c86fb1628d94ea455c7b9de898afc50378042927a59df8065a79a549"
],
"index": "pypi",
"version": "==3.9.1"
},
"six": {
@ -196,18 +175,6 @@
],
"version": "==7.0"
},
"configparser": {
"hashes": [
"sha256:296a9c0d0607f689f2a262d4ca3fa2b22146ac0acb07fd281125c86dee3bcf50",
"sha256:5e4c0d9de6ffc76f625eda1f5e28cec0700aed7cdacfe5070964df002ac02fec"
],
"index": "pypi",
"version": "==4.0.1"
},
"core": {
"editable": true,
"path": "."
},
"entrypoints": {
"hashes": [
"sha256:589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19",
@ -223,13 +190,6 @@
"index": "pypi",
"version": "==3.7.8"
},
"future": {
"hashes": [
"sha256:67045236dcfd6816dc439556d009594abf643e5eb48992e36beac09c2ca659b8"
],
"index": "pypi",
"version": "==0.17.1"
},
"grpcio": {
"hashes": [
"sha256:1303578092f1f6e4bfbc354c04ac422856c393723d3ffa032fff0f7cb5cfd693",
@ -265,7 +225,6 @@
"sha256:f71693c3396530c6b00773b029ea85e59272557e9bd6077195a6593e4229892a",
"sha256:f79f7455f8fbd43e8e9d61914ecf7f48ba1c8e271801996fef8d6a8f3cc9f39f"
],
"index": "pypi",
"version": "==1.23.0"
},
"grpcio-tools": {
@ -315,11 +274,11 @@
},
"importlib-metadata": {
"hashes": [
"sha256:0c505102757e7fa28b9f0958d8bc81301159dea16e2649858c92edc158b78a83",
"sha256:9a9f75ce32e78170905888acbf2376a81d3f21ecb3bb4867050413411d3ca7a9"
"sha256:652234b6ab8f2506ae58e528b6fbcc668831d3cc758e1bc01ef438d328b68cdb",
"sha256:6f264986fb88042bc1f0535fa9a557e6a376cfe5679dc77caac7fe8b5d43d05f"
],
"markers": "python_version < '3.8'",
"version": "==0.21"
"version": "==0.22"
},
"importlib-resources": {
"hashes": [
@ -337,34 +296,6 @@
"index": "pypi",
"version": "==4.3.21"
},
"lxml": {
"hashes": [
"sha256:02ca7bf899da57084041bb0f6095333e4d239948ad3169443f454add9f4e9cb4",
"sha256:096b82c5e0ea27ce9138bcbb205313343ee66a6e132f25c5ed67e2c8d960a1bc",
"sha256:0a920ff98cf1aac310470c644bc23b326402d3ef667ddafecb024e1713d485f1",
"sha256:17cae1730a782858a6e2758fd20dd0ef7567916c47757b694a06ffafdec20046",
"sha256:17e3950add54c882e032527795c625929613adbd2ce5162b94667334458b5a36",
"sha256:1f4f214337f6ee5825bf90a65d04d70aab05526c08191ab888cb5149501923c5",
"sha256:2e8f77db25b0a96af679e64ff9bf9dddb27d379c9900c3272f3041c4d1327c9d",
"sha256:4dffd405390a45ecb95ab5ab1c1b847553c18b0ef8ed01e10c1c8b1a76452916",
"sha256:6b899931a5648862c7b88c795eddff7588fb585e81cecce20f8d9da16eff96e0",
"sha256:726c17f3e0d7a7200718c9a890ccfeab391c9133e363a577a44717c85c71db27",
"sha256:760c12276fee05c36f95f8040180abc7fbebb9e5011447a97cdc289b5d6ab6fc",
"sha256:796685d3969815a633827c818863ee199440696b0961e200b011d79b9394bbe7",
"sha256:891fe897b49abb7db470c55664b198b1095e4943b9f82b7dcab317a19116cd38",
"sha256:a471628e20f03dcdfde00770eeaf9c77811f0c331c8805219ca7b87ac17576c5",
"sha256:a63b4fd3e2cabdcc9d918ed280bdde3e8e9641e04f3c59a2a3109644a07b9832",
"sha256:b0b84408d4eabc6de9dd1e1e0bc63e7731e890c0b378a62443e5741cfd0ae90a",
"sha256:be78485e5d5f3684e875dab60f40cddace2f5b2a8f7fede412358ab3214c3a6f",
"sha256:c27eaed872185f047bb7f7da2d21a7d8913457678c9a100a50db6da890bc28b9",
"sha256:c81cb40bff373ab7a7446d6bbca0190bccc5be3448b47b51d729e37799bb5692",
"sha256:d11874b3c33ee441059464711cd365b89fa1a9cf19ae75b0c189b01fbf735b84",
"sha256:e9c028b5897901361d81a4718d1db217b716424a0283afe9d6735fe0caf70f79",
"sha256:fe489d486cd00b739be826e8c1be188ddb74c7a1ca784d93d06fda882a6a1681"
],
"index": "pypi",
"version": "==4.4.1"
},
"mccabe": {
"hashes": [
"sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42",
@ -434,7 +365,6 @@
"sha256:eabc4cf1bc19689af8022ba52fd668564a8d96e0d08f3b4732d26a64255216a4",
"sha256:fcff6086c86fb1628d94ea455c7b9de898afc50378042927a59df8065a79a549"
],
"index": "pypi",
"version": "==3.9.1"
},
"py": {

2
daemon/core/__init__.py
View file

@ -17,7 +17,7 @@ def load_logging_config(config_path=None):
when None defaults to /etc/core/logging.conf
:return: nothing
"""
if config_path is None:
if not config_path:
config_path = os.path.join(constants.CORE_CONF_DIR, "logging.conf")
with open(config_path, "r") as log_config_file:
log_config = json.load(log_config_file)

10
daemon/requirements.txt
View file

@ -1,9 +1,7 @@
configparser==3.7.4
enum34==1.1.6
configparser==4.0.1
future==0.17.1
futures==3.2.0
grpcio==1.21.1
grpcio==1.23.0
grpcio-tools==1.21.1
lxml==4.3.3
protobuf==3.8.0
lxml==4.4.1
protobuf==3.9.1
six==1.12.0

2
daemon/scripts/core-daemon
View file

@ -101,7 +101,7 @@ def get_merged_config(filename):
"numthreads": "1",
"grpcport": "50051",
"grpcaddress": "localhost",
"logfile": None
"logfile": ""
}
parser = argparse.ArgumentParser(