diff --git a/.travis.yml b/.travis.yml index e17a02a..7d09a6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,11 @@ python: - "3.9" services: - docker +before_install: + - gem install logger +before_script: + - pip install docker-compose script: - - docker-compose --version - docker-compose run app sh -c "python manage.py test && flake8" deploy: - provider: codedeploy diff --git a/app/nslc/management/commands/load_from_fdsn.py b/app/nslc/management/commands/load_from_fdsn.py index b00f572..9e1d855 100644 --- a/app/nslc/management/commands/load_from_fdsn.py +++ b/app/nslc/management/commands/load_from_fdsn.py @@ -1,10 +1,13 @@ """ 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,2M &sta=* &cha=EN?,HN?,?H? &loc=* @@ -57,7 +60,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 +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", "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", "2M" ] options["net"] = ','.join(ALLOWED_NETWORKS) LOADER_EMAIL = os.environ.get('LOADER_EMAIL') diff --git a/requirements/base.txt b/requirements/base.txt index 64c8899..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.5 +urllib3==1.26.16 zipp==3.4.0