update public and test server URL's (#137)

Author: alexbruy

.github/workflows/autotests.yml

@@ -1,7 +1,7 @@
 name: Auto Tests
 on: [push]
 env:
-  TEST_MERGIN_URL: https://test.dev.cloudmergin.com/
+  TEST_MERGIN_URL: https://test.dev.merginmaps.com/
   TEST_API_USERNAME: test_plugin
   TEST_API_PASSWORD: ${{ secrets.MERGINTEST_API_PASSWORD }}
   TEST_API_USERNAME2: test_plugin2

README.md

@@ -2,10 +2,10 @@
 [![Auto Tests/Package](https://github.com/lutraconsulting/mergin-py-client/workflows/Auto%20Tests/badge.svg)](https://github.com/lutraconsulting/mergin-py-client/actions?query=workflow%3A%22Auto+Tests%22)
 [![Coverage Status](https://img.shields.io/coveralls/lutraconsulting/mergin-py-client.svg)](https://coveralls.io/github/lutraconsulting/mergin-py-client)
 
-# Mergin Python Client
+# Mergin Maps Python Client
 
-This repository contains a Python client module for access to [Mergin](https://public.cloudmergin.com/)
-service and a command-line tool for easy access to data stored in Mergin.
+This repository contains a Python client module for access to [Mergin Maps](https://merginmaps.com/)
+service and a command-line tool for easy access to data stored in Mergin Maps.
 
 <div><img align="left" width="45" height="45" src="https://raw.githubusercontent.com/MerginMaps/docs/main/src/.vuepress/public/slack.svg"><a href="https://merginmaps.com/community/join">Join our community chat</a><br/>and ask questions!</div><br />
 
@@ -43,7 +43,7 @@ When the module is installed, it comes with `mergin` command line tool.
 $ mergin --help
 Usage: mergin [OPTIONS] COMMAND [ARGS]...
 
-  Command line interface for the Mergin client module. For user
+  Command line interface for the Mergin Maps client module. For user
   authentication on server there are two options:
 
    1. authorization token environment variable (MERGIN_AUTH) is defined, or
@@ -55,22 +55,22 @@ Usage: mergin [OPTIONS] COMMAND [ARGS]...
   variable manually.
 
 Options:
-  --url TEXT         Mergin server URL. Default is:
-                     https://public.cloudmergin.com
+  --url TEXT         Mergin Maps server URL. Default is:
+                     https://app.merginmaps.com/
   --auth-token TEXT  Mergin authentication token string
   --username TEXT
   --password TEXT
   --help             Show this message and exit.
 
 Commands:
   clone                Clone project from server.
-  create               Create a new project on Mergin server.
-  download             Download last version of mergin project
+  create               Create a new project on Mergin Maps server.
+  download             Download last version of Mergin Maps project
   download-file        Download project file at specified version.
   list-projects        List projects on the server
   login                Login to the service and see how to set the token...
-  pull                 Fetch changes from Mergin repository
-  push                 Upload local changes into Mergin repository
+  pull                 Fetch changes from Mergin Maps repository
+  push                 Upload local changes into Mergin Maps repository
   remove               Remove project from server.
   share                Fetch permissions to project
   share-add            Add permissions to [users] to project
@@ -101,11 +101,11 @@ working directory:
    ```
    $ mergin status
    ```
-2. pull changes from Mergin service
+2. pull changes from Mergin Maps service
    ```
    $ mergin pull
    ```
-3. push local changes to Mergin service
+3. push local changes to Mergin Maps service
    ```
    $ mergin push
    ```
@@ -130,7 +130,7 @@ it is possible to run other commands without specifying username/password.
 
 ## Development
 
-### How to release 
+### How to release
 
 1. Update version in `setup.py` and `mergin/version.py`
 2. Tag git repository with the new version
@@ -144,16 +144,16 @@ python3 -m twine upload dist/mergin-client-x.y.z.tar.gz
 ### Installing deps
 
 Python 3.7+ required. Create `mergin/deps` folder where [geodiff](https://github.com/lutraconsulting/geodiff) lib is supposed to be and install dependencies:
-```    
+```
     rm -r mergin/deps
     mkdir mergin/deps
-    pip install python-dateutil pytz 
+    pip install python-dateutil pytz
     pip install pygeodiff --target=mergin/deps
 ```
 
 For using mergin client with its dependencies packaged locally run:
 ```
-    pip install wheel 
+    pip install wheel
     python3 setup.py sdist bdist_wheel
     mkdir -p mergin/deps
     pip wheel -r mergin_client.egg-info/requires.txt -w mergin/deps
@@ -173,4 +173,4 @@ For running test do:
     export TEST_API_PASSWORD2=<pwd2>
     pip install pytest pytest-cov coveralls
     pytest --cov-report html --cov=mergin mergin/test/
-```    
+```

mergin/cli.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-Command line interface for the Mergin client module. When installed with pip, this script
+Command line interface for the Mergin Maps client module. When installed with pip, this script
 is installed as 'mergin' command line tool (defined in setup.py). If you have installed the module
 but the tool is not available, you may need to fix your PATH (e.g. add ~/.local/bin where
 pip puts these tools).
@@ -108,7 +108,7 @@ def get_token(url, username, password):
 
 
 def get_client(url=None, auth_token=None, username=None, password=None):
-    """Return Mergin client."""
+    """Return Mergin Maps client."""
     if auth_token is not None:
         try:
             mc = MerginClient(url, auth_token=auth_token)
@@ -148,15 +148,15 @@ def _print_unhandled_exception():
     "--url",
     envvar="MERGIN_URL",
     default=MerginClient.default_url(),
-    help=f"Mergin server URL. Default is: {MerginClient.default_url()}",
+    help=f"Mergin Maps server URL. Default is: {MerginClient.default_url()}",
 )
-@click.option("--auth-token", envvar="MERGIN_AUTH", help="Mergin authentication token string")
+@click.option("--auth-token", envvar="MERGIN_AUTH", help="Mergin Maps authentication token string")
 @click.option("--username", envvar="MERGIN_USERNAME")
 @click.option("--password", cls=OptionPasswordIfUser, prompt=True, hide_input=True, envvar="MERGIN_PASSWORD")
 @click.pass_context
 def cli(ctx, url, auth_token, username, password):
     """
-    Command line interface for the Mergin client module.
+    Command line interface for the Mergin Maps client module.
     For user authentication on server there are two options:
 
      1. authorization token environment variable (MERGIN_AUTH) is defined, or
@@ -188,7 +188,7 @@ def login(ctx):
                    "The directory will get assigned to the project.")
 @click.pass_context
 def create(ctx, project, public, from_dir):
-    """Create a new project on Mergin server. `project` needs to be a combination of namespace/project."""
+    """Create a new project on Mergin Maps server. `project` needs to be a combination of namespace/project."""
     mc = ctx.obj["client"]
     if mc is None:
         return
@@ -393,7 +393,7 @@ def status(ctx):
 @cli.command()
 @click.pass_context
 def push(ctx):
-    """Upload local changes into Mergin repository."""
+    """Upload local changes into Mergin Maps repository."""
     mc = ctx.obj["client"]
     if mc is None:
         return
@@ -425,7 +425,7 @@ def push(ctx):
 @cli.command()
 @click.pass_context
 def pull(ctx):
-    """Fetch changes from Mergin repository."""
+    """Fetch changes from Mergin Maps repository."""
     mc = ctx.obj["client"]
     if mc is None:
         return

mergin/client.py

@@ -53,14 +53,14 @@ def decode_token_data(token):
 
 class MerginClient:
     """
-    Client for Mergin service.
+    Client for Mergin Maps service.
 
-    :param url: String, Mergin service URL.
-    :param auth_token: String, Mergin authorization token.
-    :param login: String, login for Mergin service.
-    :param password: String, password for Mergin service.
+    :param url: String, Mergin Maps service URL.
+    :param auth_token: String, Mergin Maps authorization token.
+    :param login: String, login for Mergin Maps service.
+    :param password: String, password for Mergin Maps service.
     :param plugin_version: String, info about plugin and QGIS version.
-    :param proxy_config: Dictionary, proxy settings to use when connecting to Mergin service. At least url and port
+    :param proxy_config: Dictionary, proxy settings to use when connecting to Mergin Maps service. At least url and port
         of the server should be provided. Expected keys: "url", "port", "user", "password".
         Currently, only HTTP proxies are supported.
     """
@@ -128,7 +128,7 @@ def __init__(self, url=None, auth_token=None, login=None, password=None, plugin_
                 self.login(login, password)
 
     def setup_logging(self):
-        """Setup Mergin client logging."""
+        """Setup Mergin Maps client logging."""
         client_log_file = os.environ.get('MERGIN_CLIENT_LOG', None)
         self.log = logging.getLogger('mergin.client')
         self.log.setLevel(logging.DEBUG)  # log everything (it would otherwise log just warnings+errors)
@@ -138,14 +138,14 @@ def setup_logging(self):
                 log_handler.setFormatter(logging.Formatter('%(asctime)s %(message)s'))
                 self.log.addHandler(log_handler)
             else:
-                # no Mergin log path in the environment - create a null handler that does nothing
+                # no Mergin Maps log path in the environment - create a null handler that does nothing
                 null_logger = logging.NullHandler()
                 self.log.addHandler(null_logger)
 
     @staticmethod
     def default_url():
-        """ Returns URL of the public instance of Mergin """
-        return "https://public.cloudmergin.com"
+        """ Returns URL of the public instance of Mergin Maps"""
+        return "https://app.merginmaps.com"
 
     def user_agent_info(self):
         """ Returns string as it is sent as User-Agent http header to the server """
@@ -328,7 +328,7 @@ def user_service(self):
 
     def create_project(self, project_name, is_public=False, namespace=None):
         """
-        Create new project repository in user namespace on Mergin server.
+        Create new project repository in user namespace on Mergin Maps server.
         Optionally initialized from given local directory.
 
         :param project_name: Project name
@@ -360,7 +360,7 @@ def create_project_and_push(self, project_name, directory, is_public=False, name
         Convenience method to create project and push the initial version right after that.
         """
         if os.path.exists(os.path.join(directory, '.mergin')):
-            raise ClientError('Directory is already assigned to a Mergin project (contains .mergin sub-dir)')
+            raise ClientError('Directory is already assigned to a Mergin Maps project (contains .mergin sub-dir)')
 
         if namespace is None:
             namespace = self.username()
@@ -375,7 +375,7 @@ def create_project_and_push(self, project_name, directory, is_public=False, name
     def paginated_projects_list(self, page=1, per_page=50, tags=None, user=None, flag=None, name=None,
                                 namespace=None, order_params=None):
         """
-        Find all available mergin projects.
+        Find all available Mergin Maps projects.
 
         :param tags: Filter projects by tags ('valid_qgis', 'mappin_use', input_use')
         :type tags: List
@@ -426,7 +426,7 @@ def paginated_projects_list(self, page=1, per_page=50, tags=None, user=None, fla
 
     def projects_list(self, tags=None, user=None, flag=None, q=None):
         """
-        Find all available Mergin projects. It will always retrieve max 100 projects.
+        Find all available Mergin Maps projects. It will always retrieve max 100 projects.
         Consider using the paginated_projects_list instead.
 
         :param tags: Filter projects by tags ('valid_qgis', 'mappin_use', input_use')
@@ -732,7 +732,7 @@ def get_projects_by_names(self, projects):
         """ Returns JSON with projects' info for list of required projects.
         The schema of the returned information is the same as the response from projects_list().
 
-        This is useful when we have a couple of Mergin projects available locally and we want to
+        This is useful when we have a couple of Mergin Maps projects available locally and we want to
         find out their status at once (e.g. whether there is a new version on the server).
 
         :param projects: list of projects in the form 'namespace/project_name'

mergin/client_pull.py

@@ -97,7 +97,7 @@ def _cleanup_failed_download(directory, mergin_project=None):
     temporary files in it. We want to remove it because a new download would fail because
     the directory already exists.
     """
-    # First try to get the Mergin project logger and remove its handlers to allow the log file deletion
+    # First try to get the Mergin Maps project logger and remove its handlers to allow the log file deletion
     if mergin_project is not None:
         mergin_project.remove_logging_handler()
 
@@ -684,7 +684,7 @@ def download_diffs_async(mc, project_directory, file_path, versions):
     Args:
         mc (MerginClient): MerginClient instance.
         project_directory (str): local project directory.
-        file_path (str): file path relative to Mergin project root.
+        file_path (str): file path relative to Mergin Maps project root.
         versions (list): list of versions to download diffs for, e.g. ['v1', 'v2'].
 
     Returns:

mergin/merginproject.py

@@ -36,7 +36,7 @@
 
 
 class MerginProject:
-    """ Base class for Mergin local projects.
+    """ Base class for Mergin Maps local projects.
 
     Linked to existing local directory, with project metadata (mergin.json) and backups located in .mergin directory.
     """

mergin/test/test_client.py

@@ -44,7 +44,7 @@ def mc2():
 
 
 def create_client(user, pwd):
-    assert SERVER_URL and SERVER_URL.rstrip('/') != 'https://public.cloudmergin.com' and user and pwd
+    assert SERVER_URL and SERVER_URL.rstrip('/') != 'https://app.merginmaps.com' and user and pwd
     return MerginClient(SERVER_URL, login=user, password=pwd)
 
 
@@ -1681,7 +1681,7 @@ def test_report(mc):
     warnings = create_report(mc, directory, "v1", "v5", report_file)
     assert warnings
 
-    # rm local mergin project and try again
+    # rm local Mergin Maps project and try again
     shutil.rmtree(directory)
     with pytest.raises(InvalidProject):
         create_report(mc, directory, since, to, report_file)

mergin/utils.py

@@ -190,7 +190,7 @@ def conflicted_copy_file_name(path, user, version):
     :type path: str
     :param user: name of the user
     :type user: str
-    :param version: version of the mergin project
+    :param version: version of the Mergin Maps project
     :type version: str
     :returns: new file name
     :rtype: str
@@ -202,7 +202,7 @@ def conflicted_copy_file_name(path, user, version):
     ext = ''.join(Path(tail).suffixes)
     file_name = tail.replace(ext, '')
     # in case of QGIS project files we have to add "~" (tilde) to suffix
-    # to avoid having several QGIS project files inside Mergin project.
+    # to avoid having several QGIS project files inside Mergin Maps project.
     # See https://github.com/lutraconsulting/qgis-mergin-plugin/issues/382
     # for more details
     if ext.lower() in (".qgz", ".qgs"):
@@ -220,7 +220,7 @@ def edit_conflict_file_name(path, user, version):
     :type path: str
     :param user: name of the user
     :type user: str
-    :param version: version of the mergin project
+    :param version: version of the Mergin Maps project
     :type version: str
     :returns: new file name
     :rtype: str