From 7b4d63edebd4ac2ef344b20c94f7b6958d1c8cf8 Mon Sep 17 00:00:00 2001 From: Alex Hutko Date: Fri, 8 Mar 2024 11:30:59 -0800 Subject: [PATCH 1/7] Update load_from_fdsn.py Add NRCAN datacenter, QW and QX networks and other new networks from branch alexhutko-patch-5 that never found their way in. --- app/nslc/management/commands/load_from_fdsn.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/nslc/management/commands/load_from_fdsn.py b/app/nslc/management/commands/load_from_fdsn.py index b00f572..1dcf6ad 100644 --- a/app/nslc/management/commands/load_from_fdsn.py +++ b/app/nslc/management/commands/load_from_fdsn.py @@ -1,10 +1,10 @@ """ Command run without any options will give default URL http://service.iris.edu/irisws/fedcatalog/1/ - query?datacenter=IRISDMC,NCEDC,SCEDC + query?datacenter=IRISDMC,NCEDC,SCEDC,NRCAN &targetservice=station &level=channel - &net=AE,AG,AK,AV,AZ,BC,BK,CC,CE,CI,CN,CO,CU,ET,HV,IU,IW,LD,MB,N4,NC,NN,NP,NV,O2,OH,OK,OO,PB,PR,SN,TX,UM,UO,US,UU,UW,WR,WY + &net=AE,AG,AK,AV,AZ,BC,BK,CC,CE,CI,CN,C0,C8,CO,CU,CW,CY,EP,ET,GS,GM,HV,IE,IU,IW,JM,KY,LB,LD,LI,LM,MB,MU,MX,N4,NA,NC,NE,NM,NN,NP,NV,NW,NX,NY,O2,OH,OK,OO,PB,PE,PO,PQ,PR,PT,PY,QW,QX,RB,RC,RE,RV,SB,SC,SE,SN,TD,TR,TX,UM,UO,US,UU,UW,WR,WU,WW,WY &sta=* &cha=EN?,HN?,?H? &loc=* @@ -57,7 +57,7 @@ def add_arguments(self, parser): ) parser.add_argument( '--datacenter', - default="IRISDMC,NCEDC,SCEDC", + default="IRISDMC,NCEDC,SCEDC,NRCAN", help="Comma separated list of datacenters" ) parser.add_argument( @@ -131,10 +131,12 @@ def build_url(self, params, level): '''Django command to check network and channel tables with FDSN service''' def handle(self, *args, **options): ALLOWED_NETWORKS = [ - "AE", "AK", "AV", "AZ", "BC", "BK", "CC", "CE", "CI", "CN", "CO", - "CU", "ET", "HV", "IU", "IW", "LD", "MB", "N4", "NC", "NN", "NP", - "NV", "O2", "OH", "OK", "OO", "PB", "PR", "SN", "TX", "UM", "UO", - "US", "UU", "UW", "WR", "WY" + "AE", "AG", "AK", "AV", "AZ", "BC", "BK", "C0", "C8", "CC", "CE", "CI", "CN", "CO", + "CU", "CW", "CY", "EP", "ET", "GM", "GS", "HV", "IE", "IU", "IW", "JM", "KY", "LB", + "LD", "LI", "LM", "MB", "MU", "MX", "N4", "NA", "NC", "NE", "NM", "NN", "NP", "NV", + "NW", "NX", "NY", "O2", "OH", "OK", "OO", "PB", "PE", "PO", "PQ", "PR", "PT", "PY", + "QW", "QX", "RB", "RC", "RE", "RV", "SB", "SC", "SE", "SN", "TD", "TR", "TX", "UM", + "UO", "US", "UU", "UW", "WR", "WU", "WW", "WY" ] options["net"] = ','.join(ALLOWED_NETWORKS) LOADER_EMAIL = os.environ.get('LOADER_EMAIL') From 5cc645d068aa82ccf220a714dd219daa7465fb46 Mon Sep 17 00:00:00 2001 From: Alex Hutko Date: Fri, 8 Mar 2024 12:23:31 -0800 Subject: [PATCH 2/7] Update load_from_fdsn.py Limited lines to less than 79 characters. --- .../management/commands/load_from_fdsn.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/app/nslc/management/commands/load_from_fdsn.py b/app/nslc/management/commands/load_from_fdsn.py index 1dcf6ad..2e67d50 100644 --- a/app/nslc/management/commands/load_from_fdsn.py +++ b/app/nslc/management/commands/load_from_fdsn.py @@ -4,7 +4,10 @@ query?datacenter=IRISDMC,NCEDC,SCEDC,NRCAN &targetservice=station &level=channel - &net=AE,AG,AK,AV,AZ,BC,BK,CC,CE,CI,CN,C0,C8,CO,CU,CW,CY,EP,ET,GS,GM,HV,IE,IU,IW,JM,KY,LB,LD,LI,LM,MB,MU,MX,N4,NA,NC,NE,NM,NN,NP,NV,NW,NX,NY,O2,OH,OK,OO,PB,PE,PO,PQ,PR,PT,PY,QW,QX,RB,RC,RE,RV,SB,SC,SE,SN,TD,TR,TX,UM,UO,US,UU,UW,WR,WU,WW,WY + &net=AE,AG,AK,AV,AZ,BC,BK,CC,CE,CI,CN,C0,C8,CO,CU,CW,CY,EP,ET,GS,GM, + HV,IE,IU,IW,JM,KY,LB,LD,LI,LM,MB,MU,MX,N4,NA,NC,NE,NM,NN,NP,NV,NW,NX, + NY,O2,OH,OK,OO,PB,PE,PO,PQ,PR,PT,PY,QW,QX,RB,RC,RE,RV,SB,SC,SE,SN,TD, + TR,TX,UM,UO,US,UU,UW,WR,WU,WW,WY &sta=* &cha=EN?,HN?,?H? &loc=* @@ -131,12 +134,14 @@ def build_url(self, params, level): '''Django command to check network and channel tables with FDSN service''' def handle(self, *args, **options): ALLOWED_NETWORKS = [ - "AE", "AG", "AK", "AV", "AZ", "BC", "BK", "C0", "C8", "CC", "CE", "CI", "CN", "CO", - "CU", "CW", "CY", "EP", "ET", "GM", "GS", "HV", "IE", "IU", "IW", "JM", "KY", "LB", - "LD", "LI", "LM", "MB", "MU", "MX", "N4", "NA", "NC", "NE", "NM", "NN", "NP", "NV", - "NW", "NX", "NY", "O2", "OH", "OK", "OO", "PB", "PE", "PO", "PQ", "PR", "PT", "PY", - "QW", "QX", "RB", "RC", "RE", "RV", "SB", "SC", "SE", "SN", "TD", "TR", "TX", "UM", - "UO", "US", "UU", "UW", "WR", "WU", "WW", "WY" + "AE", "AG", "AK", "AV", "AZ", "BC", "BK", "C0", "C8", "CC", "CE", + "CI", "CN", "CO", "CU", "CW", "CY", "EP", "ET", "GM", "GS", "HV", + "IE", "IU", "IW", "JM", "KY", "LB", "LD", "LI", "LM", "MB", "MU", + "MX", "N4", "NA", "NC", "NE", "NM", "NN", "NP", "NV", "NW", "NX", + "NY", "O2", "OH", "OK", "OO", "PB", "PE", "PO", "PQ", "PR", "PT", + "PY", "QW", "QX", "RB", "RC", "RE", "RV", "SB", "SC", "SE", "SN", + "TD", "TR", "TX", "UM", "UO", "US", "UU", "UW", "WR", "WU", "WW", + "WY" ] options["net"] = ','.join(ALLOWED_NETWORKS) LOADER_EMAIL = os.environ.get('LOADER_EMAIL') From e9f9c9e8001f65373f1490ce7412733baafbea14 Mon Sep 17 00:00:00 2001 From: Alex Hutko Date: Wed, 4 Dec 2024 15:25:22 -0800 Subject: [PATCH 3/7] Update load_from_fdsn.py Added 2M network. --- app/nslc/management/commands/load_from_fdsn.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/nslc/management/commands/load_from_fdsn.py b/app/nslc/management/commands/load_from_fdsn.py index 2e67d50..9e1d855 100644 --- a/app/nslc/management/commands/load_from_fdsn.py +++ b/app/nslc/management/commands/load_from_fdsn.py @@ -7,7 +7,7 @@ &net=AE,AG,AK,AV,AZ,BC,BK,CC,CE,CI,CN,C0,C8,CO,CU,CW,CY,EP,ET,GS,GM, HV,IE,IU,IW,JM,KY,LB,LD,LI,LM,MB,MU,MX,N4,NA,NC,NE,NM,NN,NP,NV,NW,NX, NY,O2,OH,OK,OO,PB,PE,PO,PQ,PR,PT,PY,QW,QX,RB,RC,RE,RV,SB,SC,SE,SN,TD, - TR,TX,UM,UO,US,UU,UW,WR,WU,WW,WY + TR,TX,UM,UO,US,UU,UW,WR,WU,WW,WY,2M &sta=* &cha=EN?,HN?,?H? &loc=* @@ -141,7 +141,7 @@ def handle(self, *args, **options): "NY", "O2", "OH", "OK", "OO", "PB", "PE", "PO", "PQ", "PR", "PT", "PY", "QW", "QX", "RB", "RC", "RE", "RV", "SB", "SC", "SE", "SN", "TD", "TR", "TX", "UM", "UO", "US", "UU", "UW", "WR", "WU", "WW", - "WY" + "WY", "2M" ] options["net"] = ','.join(ALLOWED_NETWORKS) LOADER_EMAIL = os.environ.get('LOADER_EMAIL') From 533abc5350fd32e303fd8ce7ee67417c2653ab02 Mon Sep 17 00:00:00 2001 From: Kyla Marczewski Date: Thu, 3 Apr 2025 16:28:37 -0700 Subject: [PATCH 4/7] attempt to fix travis issue --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index d9055d1..d69380a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,8 @@ python: - "3.6" services: - docker +before_install: + - gem install logger before_script: - pip install docker-compose script: From 64040a0ae9f236ca87f49cfe0f7353f99c11a1d7 Mon Sep 17 00:00:00 2001 From: Kyla Marczewski Date: Fri, 4 Apr 2025 10:00:10 -0700 Subject: [PATCH 5/7] remove erroring line --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 773fced..7d09a6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,6 @@ before_install: before_script: - pip install docker-compose script: - - docker-compose --version - docker-compose run app sh -c "python manage.py test && flake8" deploy: - provider: codedeploy From a58eaee21ff699b3ec0f6785cc81553102562de5 Mon Sep 17 00:00:00 2001 From: Kyla Marczewski Date: Fri, 4 Apr 2025 10:21:11 -0700 Subject: [PATCH 6/7] update urllib --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index 64c8899..68dc432 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -53,5 +53,5 @@ sortedcontainers==2.2.2 soupsieve==2.0.1 sqlparse==0.4.2 uritemplate==3.0.1 -urllib3==1.26.5 +urllib3==1.26.15 zipp==3.4.0 From 5d1bcdb7c4aa4b06117ab85cc65990c11758eb1e Mon Sep 17 00:00:00 2001 From: Kyla Marczewski Date: Thu, 1 May 2025 11:35:03 -0700 Subject: [PATCH 7/7] change urllib3 version --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index 68dc432..6def372 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -53,5 +53,5 @@ sortedcontainers==2.2.2 soupsieve==2.0.1 sqlparse==0.4.2 uritemplate==3.0.1 -urllib3==1.26.15 +urllib3==1.26.16 zipp==3.4.0