changed default public url to slideruleearth.io

jpswinski · jpswinski · commit abb7d7222ca5 · 2022-09-29T17:31:36.000Z
diff --git a/README.md b/README.md
@@ -6,15 +6,15 @@
 
 SlideRule's Python client makes it easier to interact with SlideRule from a Python script.
 
-Detailed [documentation](http://icesat2sliderule.org/rtd/) on installing and using this client can be found at [icesat2sliderule.org](http://icesat2sliderule.org).
+Detailed [documentation](https://www.slideruleearth.org/rtd/) on installing and using this client can be found at [slideruleearth.io](https://www.slideruleearth.org).
 
 ## I. Installing the SlideRule Python Client
 
 ```bash
 conda install -c conda-forge sliderule
 ```
 
-For alternate methods to install SlideRule, including options for developers, please see the [installation instructions](http://icesat2sliderule.org/rtd/getting_started/Install.html) on icesat2sliderule.org.
+For alternate methods to install SlideRule, including options for developers, please see the [installation instructions](https://www.slideruleearth.org/rtd/getting_started/Install.html) on slideruleearth.io.
 
 ### Dependencies
 
@@ -32,7 +32,7 @@ Example usage:
 from sliderule import icesat2
 
 # initialize
-icesat2.init("icesat2sliderule.org", verbose=True)
+icesat2.init("slideruleearth.io", verbose=True)
 
 # region of interest
 region = [ {"lon":-105.82971551223244, "lat": 39.81983728534918},
@@ -59,7 +59,7 @@ More extensive examples in the form of Jupyter Notebooks can be found in the [ex
 
 ## III. Reference and User's Guide
 
-Please see our [documentation](http://icesat2sliderule.org/rtd/) page for reference and user's guide material.
+Please see our [documentation](https://www.slideruleearth.org/rtd/) page for reference and user's guide material.
 
 ## IV. Licensing
 
diff --git a/examples/Grand_mesa_ATL03_classification.ipynb b/examples/Grand_mesa_ATL03_classification.ipynb
@@ -39,7 +39,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "url = \"icesat2sliderule.org\"\n",
+    "url = \"slideruleearth.io\"\n",
     "icesat2.init(url, verbose=False)\n",
     "asset = \"nsidc-s3\""
    ]
diff --git a/examples/api_widgets_demo.ipynb b/examples/api_widgets_demo.ipynb
@@ -10,7 +10,7 @@
     "\n",
     "The SlideRule ICESat-2 plug-in is a cloud-optimized version of the [ATL06 algorithm](https://nsidc.org/sites/nsidc.org/files/technical-references/ICESat2_ATL06_ATBD_r005.pdf) that can process the lower-level [ATL03 geolocated photon height data products](https://nsidc.org/data/atl03) hosted on AWS by the NSIDC DAAC.  \n",
     "\n",
-    "[Documentation for using SlideRule](http://icesat2sliderule.org/rtd) is available from the [project website](http://icesat2sliderule.org) \n",
+    "[Documentation for using SlideRule](https://slideruleearth.io/rtd) is available from the [project website](https://slideruleearth.io) \n",
     "\n",
     "### Background\n",
     "SlideRule creates a simplified version of the [ICESat-2 ATL06 land ice height product](https://nsidc.org/data/atl06) that can be adjusted to suit different needs.  SlideRule let's you create customized ICESat-2 segment heights _directly_ from the photon height data anywhere on the globe, _on-demand_ and quickly.\n",
@@ -63,7 +63,7 @@
    "source": [
     "# set the url for the sliderule service\n",
     "# set the logging level\n",
-    "icesat2.init(\"icesat2sliderule.org\", loglevel=logging.WARNING)"
+    "icesat2.init(\"slideruleearth.io\", loglevel=logging.WARNING)"
    ]
   },
   {
@@ -249,7 +249,7 @@
     "### Review GeoDataFrame output\n",
     "Can inspect the columns, number of returns and returns at the top of the GeoDataFrame.\n",
     "\n",
-    "See the [ICESat-2 documentation](http://icesat2sliderule.org/rtd/user_guide/ICESat-2.html#elevations) for descriptions of each column"
+    "See the [ICESat-2 documentation](https://slideruleearth.io/rtd/user_guide/ICESat-2.html#elevations) for descriptions of each column"
    ]
   },
   {
diff --git a/examples/atl03_widgets_demo.ipynb b/examples/atl03_widgets_demo.ipynb
@@ -8,7 +8,7 @@
     "\n",
     "SlideRule is an on-demand science data processing service that runs in on Amazon Web Services and responds to REST API calls to process and return science results.  SlideRule was designed to enable researchers and other data systems to have low-latency access to custom-generated, high-level, analysis-ready data products using processing parameters supplied at the time of the request. \n",
     "\n",
-    "[Documentation for using SlideRule](http://icesat2sliderule.org/rtd) is available from the [project website](http://icesat2sliderule.org) \n",
+    "[Documentation for using SlideRule](https://slideruleearth.io/rtd) is available from the [project website](https://slideruleearth.io) \n",
     "\n",
     "### Background\n",
     "SlideRule can subset ATL03 geolocated photon height data _on-demand_ and calculate photon classifications to suit different needs.\n",
@@ -61,7 +61,7 @@
    "source": [
     "# set the url for the sliderule service\n",
     "# set the logging level\n",
-    "icesat2.init(\"icesat2sliderule.org\", loglevel=logging.WARNING)"
+    "icesat2.init(\"slideruleearth.io\", loglevel=logging.WARNING)"
    ]
   },
   {
@@ -264,7 +264,7 @@
     "### Review GeoDataFrame output\n",
     "Can inspect the columns, number of returns and returns at the top of the GeoDataFrame.\n",
     "\n",
-    "See the [ICESat-2 documentation](http://icesat2sliderule.org/rtd/user_guide/ICESat-2.html#elevations) for descriptions of each column"
+    "See the [ICESat-2 documentation](https://slideruleearth.io/rtd/user_guide/ICESat-2.html#elevations) for descriptions of each column"
    ]
   },
   {
diff --git a/examples/boulder_watershed_demo.ipynb b/examples/boulder_watershed_demo.ipynb
@@ -44,7 +44,7 @@
    "outputs": [],
    "source": [
     "# Configure ICESat-2 API\n",
-    "icesat2.init(\"icesat2sliderule.org\", False)\n",
+    "icesat2.init(\"slideruleearth.io\", False)\n",
     "# Configure Region of Interest\n",
     "region = [ {\"lon\":-105.82971551223244, \"lat\": 39.81983728534918},\n",
     "           {\"lon\":-105.30742121965137, \"lat\": 39.81983728534918},\n",
diff --git a/examples/cmr_debug_regions.ipynb b/examples/cmr_debug_regions.ipynb
@@ -59,7 +59,7 @@
    "outputs": [],
    "source": [
     "# Configure ICESat-2 API\n",
-    "icesat2.init(\"icesat2sliderule.org\", loglevel=logging.WARNING)\n",
+    "icesat2.init(\"slideruleearth.io\", loglevel=logging.WARNING)\n",
     "icesat2.get_version()\n",
     "\n",
     "# dropdown menu for ICESat-2 product\n",
diff --git a/examples/grand_mesa_demo.ipynb b/examples/grand_mesa_demo.ipynb
@@ -54,7 +54,7 @@
    "outputs": [],
    "source": [
     "# Configure ICESat-2 API\n",
-    "icesat2.init(\"icesat2sliderule.org\", verbose=False)"
+    "icesat2.init(\"slideruleearth.io\", verbose=False)"
    ]
   },
   {
diff --git a/examples/single_track_demo.ipynb b/examples/single_track_demo.ipynb
@@ -43,7 +43,7 @@
    "outputs": [],
    "source": [
     "# Configure Session #\n",
-    "icesat2.init(\"icesat2sliderule.org\", True)\n",
+    "icesat2.init(\"slideruleearth.io\", True)\n",
     "asset = 'nsidc-s3'"
    ]
   },
diff --git a/examples/voila_demo.ipynb b/examples/voila_demo.ipynb
@@ -22,7 +22,7 @@
     "\n",
     "#### SlideRule is an on-demand science data processing service that runs in the cloud and responds to REST API calls to process and return science results.\n",
     "\n",
-    "This web page demonstrates a simple use of SlideRule to return elevations within a small region of interest using processing parameters specified at the time of the request.  The web page is implemented inside a Jupyter Notebook using SlideRule's Python client, and is statically served using Voila.  For more information on SlideRule, and how to install and use it for your own analysis applications, please see our website at [icesat2sliderule.org](http://icesat2sliderule.org).\n",
+    "This web page demonstrates a simple use of SlideRule to return elevations within a small region of interest using processing parameters specified at the time of the request.  The web page is implemented inside a Jupyter Notebook using SlideRule's Python client, and is statically served using Voila.  For more information on SlideRule, and how to install and use it for your own analysis applications, please see our website at [slideruleearth.io](https://slideruleearth.io).\n",
     "\n",
     "| Step 1 | Step 2 | Step 3 | Step 4 | Step 5 |\n",
     "|--------|--------|--------|--------|--------|\n",
@@ -45,7 +45,7 @@
     }
    },
    "source": [
-    "## Gridded Elevations ([atl06p](http://icesat2sliderule.org/rtd/api_reference/icesat2.html#atl06p))"
+    "## Gridded Elevations ([atl06p](https://slideruleearth.io/rtd/api_reference/icesat2.html#atl06p))"
    ]
   },
   {
@@ -375,7 +375,7 @@
     }
    },
    "source": [
-    "## Photon Cloud ([atl03sp](http://icesat2sliderule.org/rtd/api_reference/icesat2.html#atl03spElevations))"
+    "## Photon Cloud ([atl03sp](https://slideruleearth.io/rtd/api_reference/icesat2.html#atl03spElevations))"
    ]
   },
   {
diff --git a/sliderule/icesat2.py b/sliderule/icesat2.py
@@ -683,7 +683,7 @@ def atl06p(parm, asset=DEFAULT_ASSET, version=DEFAULT_ICESAT2_SDP_VERSION, callb
     Examples
     --------
         >>> from sliderule import icesat2
-        >>> icesat2.init("icesat2sliderule.org", True)
+        >>> icesat2.init("slideruleearth.io", True)
         >>> parms = { "cnf": 4, "ats": 20.0, "cnt": 10, "len": 40.0, "res": 20.0, "maxi": 1 }
         >>> resources = ["ATL03_20181019065445_03150111_003_01.h5"]
         >>> atl03_asset = "atlas-local"
@@ -1063,7 +1063,7 @@ def toregion(source, tolerance=0.0, cellsize=0.01, n_clusters=1):
         >>> region_filename = sys.argv[1]
         >>> region = icesat2.toregion(region_filename)
         >>> # Configure SlideRule #
-        >>> icesat2.init("icesat2sliderule.org", False)
+        >>> icesat2.init("slideruleearth.io", False)
         >>> # Build ATL06 Request #
         >>> parms = {
         ...     "poly": region["poly"],
diff --git a/sliderule/sliderule.py b/sliderule/sliderule.py
@@ -41,7 +41,7 @@
 # GLOBALS
 ###############################################################################
 
-PUBLIC_URL = "icesat2sliderule.org"
+PUBLIC_URL = "slideruleearth.io"
 PUBLIC_ORG = "sliderule"
 
 service_url = PUBLIC_URL
@@ -359,7 +359,7 @@ def source (api, parm={}, stream=False, callbacks={}):
     Examples
     --------
         >>> import sliderule
-        >>> sliderule.set_url("icesat2sliderule.org")
+        >>> sliderule.set_url("slideruleearth.io")
         >>> rqst = {
         ...     "time": "NOW",
         ...     "input": "NOW",
@@ -635,7 +635,7 @@ def get_definition (rectype, fieldname):
     Examples
     --------
         >>> import sliderule
-        >>> sliderule.set_url("icesat2sliderule.org")
+        >>> sliderule.set_url("slideruleearth.io")
         >>> sliderule.get_definition("atl03rec", "cycle")
         {'fmt': 'H', 'size': 2, 'nptype': <class 'numpy.uint16'>}
     '''
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,15 +1,9 @@
 import pytest
 
 def pytest_addoption(parser):
-    parser.addoption("--server", action="store", default="icesat2sliderule.org")
+    parser.addoption("--server", action="store", default="slideruleearth.io")
     parser.addoption("--asset", action="store", default="nsidc-s3")
-
-#def pytest_generate_tests(metafunc):
-#    # This is called for every test. Only get/set command line arguments
-#    # if the argument is specified in the list of test "fixturenames".
-#    option_value = metafunc.config.option.server
-#    if 'server' in metafunc.fixturenames and option_value is not None:
-#        metafunc.parametrize("server", [option_value])
+    parser.addoption("--organization", action="store", default="sliderule")
 
 @pytest.fixture(scope='session')
 def server(request):
@@ -24,3 +18,10 @@ def asset(request):
     if asset_value is None:
         pytest.skip()
     return asset_value
+
+@pytest.fixture(scope='session')
+def organization(request):
+    organization_value = request.config.option.organization
+    if organization_value is None:
+        pytest.skip()
+    return organization_value
diff --git a/tests/test_algorithm.py b/tests/test_algorithm.py
@@ -8,8 +8,8 @@
 
 @pytest.mark.network
 class TestAlgorithm:
-    def test_atl06(self, server, asset):
-        icesat2.init(server)
+    def test_atl06(self, server, asset, organization):
+        icesat2.init(server, organization=organization)
         resource = "ATL03_20181019065445_03150111_004_01.h5"
         parms = { "cnf": "atl03_high",
                   "ats": 20.0,
@@ -22,8 +22,8 @@ def test_atl06(self, server, asset):
         assert min(gdf["cycle"]) == 1
         assert len(gdf["h_mean"]) == 622423
 
-    def test_atl06p(self, server, asset):
-        icesat2.init(server)
+    def test_atl06p(self, server, asset, organization):
+        icesat2.init(server, organization=organization)
         resource = "ATL03_20181019065445_03150111_004_01.h5"
         parms = { "cnf": "atl03_high",
                   "ats": 20.0,
@@ -36,8 +36,8 @@ def test_atl06p(self, server, asset):
         assert min(gdf["cycle"]) == 1
         assert len(gdf["h_mean"]) == 622423
 
-    def test_atl03(self, server, asset):
-        icesat2.init(server)
+    def test_atl03s(self, server, asset, organization):
+        icesat2.init(server, organization=organization)
         resource = "ATL03_20181019065445_03150111_004_01.h5"
         region = [ { "lat": -80.75, "lon": -70.00 },
                    { "lat": -81.00, "lon": -70.00 },
@@ -60,8 +60,8 @@ def test_atl03(self, server, asset):
         assert min(gdf["cycle"]) == 1
         assert len(gdf["height"]) == 488673
 
-    def test_atl03(self, server, asset):
-        icesat2.init(server)
+    def test_atl03sp(self, server, asset, organization):
+        icesat2.init(server, organization=organization)
         resource = "ATL03_20181019065445_03150111_004_01.h5"
         region = [ { "lat": -80.75, "lon": -70.00 },
                    { "lat": -81.00, "lon": -70.00 },
@@ -84,8 +84,8 @@ def test_atl03(self, server, asset):
         assert min(gdf["cycle"]) == 1
         assert len(gdf["height"]) == 488673
 
-    def test_atl08(self, server, asset):
-        icesat2.init(server)
+    def test_atl08(self, server, asset, organization):
+        icesat2.init(server, organization=organization)
         resource = "ATL03_20181213075606_11560106_004_01.h5"
         track = 1
         region = [ {"lon": -108.3435200747503, "lat": 38.89102961045247},
@@ -113,8 +113,8 @@ def test_atl08(self, server, asset):
         assert len(gdf[gdf["atl08_class"] == 3]) == 18298
         assert len(gdf[gdf["atl08_class"] == 4]) == 16050
 
-    def test_gs(self, server, asset):
-        icesat2.init(server)
+    def test_gs(self, server, asset, organization):
+        icesat2.init(server, organization=organization)
         resource_prefix = "20210114170723_03311012_004_01.h5"
         region = [ {"lon": 126.54560629670780, "lat": -70.28232209449946},
                    {"lon": 114.29798416287946, "lat": -70.08880029415151},
diff --git a/tests/test_api.py b/tests/test_api.py
@@ -9,8 +9,8 @@
 
 @pytest.mark.network
 class TestApi:
-    def test_time(self, server):
-        icesat2.init(server)
+    def test_time(self, server, organization):
+        icesat2.init(server, organization=organization)
         rqst = {
             "time": "NOW",
             "input": "NOW",
@@ -28,8 +28,8 @@ def test_time(self, server):
         again = d["time"]
         assert now == again
 
-    def test_geospatial1(self, server, asset):
-        icesat2.init(server)
+    def test_geospatial1(self, server, asset, organization):
+        icesat2.init(server, organization=organization)
         test = {
             "asset": asset,
             "pole": "north",
@@ -73,8 +73,8 @@ def test_geospatial1(self, server, asset):
         assert d["lat"] == 40.0 and d["lon"] == 60.0
         assert d["x"] == 0.466307658155 and d["y"] == 0.80766855588292
 
-    def test_geospatial2(self, server, asset):
-        icesat2.init(server)
+    def test_geospatial2(self, server, asset, organization):
+        icesat2.init(server, organization=organization)
         test = {
             "asset": asset,
             "pole": "north",
@@ -86,8 +86,8 @@ def test_geospatial2(self, server, asset):
         d = sliderule.source("geo", test)
         assert abs(d["lat"] - 30.0) < 0.0001 and d["lon"] == 100.0
 
-    def test_geospatial3(self, server, asset):
-        icesat2.init(server)
+    def test_geospatial3(self, server, asset, organization):
+        icesat2.init(server, organization=organization)
         test = {
             "asset": asset,
             "pole": "north",
@@ -99,8 +99,8 @@ def test_geospatial3(self, server, asset):
         d = sliderule.source("geo", test)
         assert abs(d["lat"] - 30.0) < 0.0001 and d["lon"] == -100.0
 
-    def test_geospatial4(self, server, asset):
-        icesat2.init(server)
+    def test_geospatial4(self, server, asset, organization):
+        icesat2.init(server, organization=organization)
         test = {
             "asset": asset,
             "pole": "north",
@@ -112,16 +112,16 @@ def test_geospatial4(self, server, asset):
         d = sliderule.source("geo", test)
         assert abs(d["lat"] - 30.0) < 0.0001 and d["lon"] == -80.0
 
-    def test_definition(self, server):
-        icesat2.init(server)
+    def test_definition(self, server, organization):
+        icesat2.init(server, organization=organization)
         rqst = {
             "rectype": "atl06rec.elevation",
         }
         d = sliderule.source("definition", rqst)
         assert d["delta_time"]["offset"] == 192
 
-    def test_version(self, server):
-        icesat2.init(server)
+    def test_version(self, server, organization):
+        icesat2.init(server, organization=organization)
         rsps = sliderule.source("version", {})
         assert 'server' in rsps
         assert 'version' in rsps['server']
diff --git a/tests/test_geojson.py b/tests/test_geojson.py
@@ -9,8 +9,8 @@
 
 @pytest.mark.network
 class TestGeoJson:
-    def test_atl06(self, server, asset):
-        icesat2.init(server, False)
+    def test_atl06(self, server, asset, organization):
+        icesat2.init(server, organization=organization)
         for testfile in ["data/grandmesa.geojson", "data/grandmesa.shp"]:
             region = icesat2.toregion(os.path.join(TESTDIR, testfile))
             parms = {
diff --git a/tests/test_h5.py b/tests/test_h5.py
diff --git a/tests/test_h5p.py b/tests/test_h5p.py
diff --git a/tests/test_icesat2.py b/tests/test_icesat2.py
diff --git a/tests/test_luaerr.py b/tests/test_luaerr.py

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`"metadata": {},`
`40`	`40`	`"outputs": [],`
`41`	`41`	`"source": [`
`42`		`- "url = \"icesat2sliderule.org\"\n",`
	`42`	`+ "url = \"slideruleearth.io\"\n",`
`43`	`43`	`"icesat2.init(url, verbose=False)\n",`
`44`	`44`	`"asset = \"nsidc-s3\""`
`45`	`45`	`]`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@`
`54`	`54`	`"outputs": [],`
`55`	`55`	`"source": [`
`56`	`56`	`"# Configure ICESat-2 API\n",`
`57`		`- "icesat2.init(\"icesat2sliderule.org\", verbose=False)"`
	`57`	`+ "icesat2.init(\"slideruleearth.io\", verbose=False)"`
`58`	`58`	`]`
`59`	`59`	`},`
`60`	`60`	`{`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@`
`43`	`43`	`"outputs": [],`
`44`	`44`	`"source": [`
`45`	`45`	`"# Configure Session #\n",`
`46`		`- "icesat2.init(\"icesat2sliderule.org\", True)\n",`
	`46`	`+ "icesat2.init(\"slideruleearth.io\", True)\n",`
`47`	`47`	`"asset = 'nsidc-s3'"`
`48`	`48`	`]`
`49`	`49`	`},`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`"\n",`
`23`	`23`	`"#### SlideRule is an on-demand science data processing service that runs in the cloud and responds to REST API calls to process and return science results.\n",`
`24`	`24`	`"\n",`
`25`		`- "This web page demonstrates a simple use of SlideRule to return elevations within a small region of interest using processing parameters specified at the time of the request. The web page is implemented inside a Jupyter Notebook using SlideRule's Python client, and is statically served using Voila. For more information on SlideRule, and how to install and use it for your own analysis applications, please see our website at [icesat2sliderule.org](http://icesat2sliderule.org).\n",`
	`25`	`+ "This web page demonstrates a simple use of SlideRule to return elevations within a small region of interest using processing parameters specified at the time of the request. The web page is implemented inside a Jupyter Notebook using SlideRule's Python client, and is statically served using Voila. For more information on SlideRule, and how to install and use it for your own analysis applications, please see our website at [slideruleearth.io](https://slideruleearth.io).\n",`
`26`	`26`	`"\n",`
`27`	`27`	`"\| Step 1 \| Step 2 \| Step 3 \| Step 4 \| Step 5 \|\n",`
`28`	`28`	`"\|--------\|--------\|--------\|--------\|--------\|\n",`
`@@ -45,7 +45,7 @@`
`45`	`45`	`}`
`46`	`46`	`},`
`47`	`47`	`"source": [`
`48`		`- "## Gridded Elevations ([atl06p](http://icesat2sliderule.org/rtd/api_reference/icesat2.html#atl06p))"`
	`48`	`+ "## Gridded Elevations ([atl06p](https://slideruleearth.io/rtd/api_reference/icesat2.html#atl06p))"`
`49`	`49`	`]`
`50`	`50`	`},`
`51`	`51`	`{`
`@@ -375,7 +375,7 @@`
`375`	`375`	`}`
`376`	`376`	`},`
`377`	`377`	`"source": [`
`378`		`- "## Photon Cloud ([atl03sp](http://icesat2sliderule.org/rtd/api_reference/icesat2.html#atl03spElevations))"`
	`378`	`+ "## Photon Cloud ([atl03sp](https://slideruleearth.io/rtd/api_reference/icesat2.html#atl03spElevations))"`
`379`	`379`	`]`
`380`	`380`	`},`
`381`	`381`	`{`