girder 3.2.7.dev8__tar.gz → 3.2.7.dev16__tar.gz

{girder-3.2.7.dev8 → girder-3.2.7.dev16}/CONTRIBUTING.rst

@@ -6,7 +6,7 @@ look through the documentation first if something is unclear, and let us know ho
 do better.
 
 - Ask a question on the `Girder users email list <http://public.kitware.com/mailman/listinfo/girder-users>`_
-- Ask a question in the `Discourse Forum <https://discourse.girder.org>`_
+- Ask a question on the `Discussion Forum <https://github.com/orgs/girder/discussions>`_
 - Submit a feature request or bug, or add to the discussion on the `Girder issue tracker <https://github.com/girder/girder/issues>`_
 - Submit a `Pull Request <https://github.com/girder/girder/pulls>`_ to improve Girder or its documentation
 

{girder-3.2.7.dev8/girder.egg-info → girder-3.2.7.dev16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: girder
-Version: 3.2.7.dev8
+Version: 3.2.7.dev16
 Summary: Web-based data management platform
 Home-page: https://girder.readthedocs.org
 Author: Kitware, Inc.
@@ -43,16 +43,15 @@ Requires-Dist: fusepy>=3.0; extra == "mount"
 
 **Data Management Platform**
 
-Girder is a free and open source web-based data management platform developed by
-`Kitware <https://kitware.com>`_ as part of the `Resonant <http://resonant.kitware.com>`_
-data and analytics ecosystem.
+Girder is a free and open source web-based data management platform, developed by
+`Kitware <https://kitware.com>`_.
 
 |kitware-logo|
 
 Documentation of the Girder platform can be found at
 https://girder.readthedocs.io.
 
-For questions, comments, or to get in touch with the maintainers, head to our `Discourse forum <https://discourse.girder.org>`_.
+For questions, comments, or to get in touch with the maintainers, head to our `Discussion forum <https://github.com/orgs/girder/discussions>`_.
 
 We'd love for you to `contribute to Girder <CONTRIBUTING.rst>`_.
 

{girder-3.2.7.dev8 → girder-3.2.7.dev16}/README.rst

@@ -3,16 +3,15 @@
 
 **Data Management Platform**
 
-Girder is a free and open source web-based data management platform developed by
-`Kitware <https://kitware.com>`_ as part of the `Resonant <http://resonant.kitware.com>`_
-data and analytics ecosystem.
+Girder is a free and open source web-based data management platform, developed by
+`Kitware <https://kitware.com>`_.
 
 |kitware-logo|
 
 Documentation of the Girder platform can be found at
 https://girder.readthedocs.io.
 
-For questions, comments, or to get in touch with the maintainers, head to our `Discourse forum <https://discourse.girder.org>`_.
+For questions, comments, or to get in touch with the maintainers, head to our `Discussion forum <https://github.com/orgs/girder/discussions>`_.
 
 We'd love for you to `contribute to Girder <CONTRIBUTING.rst>`_.
 

{girder-3.2.7.dev8 → girder-3.2.7.dev16}/docs/index.rst

@@ -1,7 +1,7 @@
 Girder: a data management platform
 ==================================
 
-|build-status| |license-badge| |discourse-badge| |codecov-badge| |github-badge|
+|build-status| |license-badge| |codecov-badge| |github-badge|
 
 .. |build-status| image:: https://circleci.com/gh/girder/girder.png?style=shield
     :target: https://circleci.com/gh/girder/girder
@@ -19,17 +19,12 @@ Girder: a data management platform
     :target: https://github.com/girder/girder
     :alt: GitHub
 
-.. |discourse-badge| image:: https://img.shields.io/badge/discourse-forum-blue.svg
-   :target: https://discourse.girder.org
-   :alt: Discourse
-
 
 What is Girder?
 ---------------
 
-Girder is a free and open source web-based **data management platform** developed by
-`Kitware <http://www.kitware.com/>`_ as part of the
-`Resonant data and analytics ecosystem <http://resonant.kitware.com/>`_. What does
+Girder is a free and open source web-based **data management platform**, developed by
+`Kitware <http://www.kitware.com/>`_. What does
 that mean? Girder is both a standalone application and a platform for building new web
 services. It's meant to enable quick and easy construction of web applications
 that have some or all of the following requirements:

{girder-3.2.7.dev8 → girder-3.2.7.dev16}/docs/migration-guide.rst

@@ -332,7 +332,7 @@ respectively.
 Removed insecure sha512 password hashing
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 The ``core.hash_alg`` and ``core.bcrypt_rounds`` configuration parameters were also removed.
-Password hashing now always occurs with 12-round bcrypt. Please reach out to us on Discourse if you
+Password hashing now always occurs with 12-round bcrypt. Please reach out to us on `Github Discussions <https://github.com/orgs/girder/discussions>`_` if you
 have existing databases with sha512 passwords or believe you need to configure bcrypt to use
 additional rounds.
 
@@ -358,7 +358,7 @@ Removed or moved plugins
 Many plugins were either deleted from the main repository, or moved to other repositories. Plugins
 are no longer installable via a ``[plugins]`` extra when installing the ``girder`` Python package;
 rather, all are installed by ``pip install girder-[plugin_name]``. If you were depending on a plugin
-that was deleted altogether, please reach out to us on Discourse for discussion of a path forward.
+that was deleted altogether, please reach out to us on `Github Discussions <https://github.com/orgs/girder/discussions>`_ for discussion of a path forward.
 
 The following plugins were **deleted**:
 

{girder-3.2.7.dev8 → girder-3.2.7.dev16}/docs/user-guide.rst

@@ -16,7 +16,7 @@ Document Conventions
 
 This User Guide is written for end-users of Girder, rather than developers. If you
 have suggestions or questions about this documentation, feel free to contact us through our
-`Discourse discussion forum <https://discourse.girder.org>`_,
+`Github Discussions forum <https://github.com/orgs/girder/discussions>`_,
 `on GitHub <https://github.com/girder/girder>`_, or `through Kitware support <mailto:kitware@kitware.com>`_.
 
 Girder specific entities will be ``formatted like this``.

{girder-3.2.7.dev8 → girder-3.2.7.dev16}/girder/utility/s3_assetstore_adapter.py

@@ -468,6 +468,14 @@ class S3AssetstoreAdapter(AbstractAssetstoreAdapter):
                     progress.update(message=obj['Prefix'])
 
                 name = obj['Prefix'].rstrip('/').rsplit('/', 1)[-1]
+                # If there is already an item with the folder's name, append
+                # '/'.  This is how S3 presents the names, allowing a folder
+                # and file to have the same name once stripped of the right /.
+                if parentType == 'folder' and Item().findOne({
+                    'folderId': parent['_id'],
+                    'name': self.safeName(name),
+                }):
+                    name = name + '/'
                 folder = Folder().createFolder(
                     parent=parent, name=self.safeName(name),
                     parentType=parentType, creator=user, reuseExisting=True)

{girder-3.2.7.dev8 → girder-3.2.7.dev16}/girder/web_client/src/templates/body/frontPage.pug

@@ -52,18 +52,17 @@
           | Girder is
         else
           | #{brandName} is powered by Girder,
-        |  a part of
-        a(target="_blank", href="http://resonant.kitware.com")  Resonant
-        | , Kitware's open-source platform for data management, analytics, and
-        | visualization. To learn more, you can read our series of
-        a(target="_blank", href="https://blog.kitware.com/tag/resonant/")  blog posts
-        |  about Resonant, or
+        | Kitware's open-source platform for data management, analytics, and
+        | visualization. To learn more about how Kitware and Girder can help to solve your
+        | data challenges, read our series of
+        a(target="_blank", href="https://blog.kitware.com/tag/girder/")  blog posts
+        | or
         a(target="_blank", href="http://www.kitware.com/contact-us")  contact us
-        |  to learn how we can help you solve your data problems.
+        | directly.
 
         ul
           li
-            | To learn more about Girder, including how you can host your own
+            | To learn more about Girder's software, including how you can host your own
             | instance either locally or in the cloud, see the
             a(target="_blank", href="http://girder.readthedocs.io/en/latest/user-guide.html")  User Guide
             | , the

{girder-3.2.7.dev8 → girder-3.2.7.dev16/girder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: girder
-Version: 3.2.7.dev8
+Version: 3.2.7.dev16
 Summary: Web-based data management platform
 Home-page: https://girder.readthedocs.org
 Author: Kitware, Inc.
@@ -43,16 +43,15 @@ Requires-Dist: fusepy>=3.0; extra == "mount"
 
 **Data Management Platform**
 
-Girder is a free and open source web-based data management platform developed by
-`Kitware <https://kitware.com>`_ as part of the `Resonant <http://resonant.kitware.com>`_
-data and analytics ecosystem.
+Girder is a free and open source web-based data management platform, developed by
+`Kitware <https://kitware.com>`_.
 
 |kitware-logo|
 
 Documentation of the Girder platform can be found at
 https://girder.readthedocs.io.
 
-For questions, comments, or to get in touch with the maintainers, head to our `Discourse forum <https://discourse.girder.org>`_.
+For questions, comments, or to get in touch with the maintainers, head to our `Discussion forum <https://github.com/orgs/girder/discussions>`_.
 
 We'd love for you to `contribute to Girder <CONTRIBUTING.rst>`_.
 

{girder-3.2.7.dev8 → girder-3.2.7.dev16}/tox.ini

@@ -169,6 +169,8 @@ ignore =
     N818,
     # W503 - Line break occurred before a binary operator
     W503,
+    # B041 - Duplicate key-values in a dictionary
+    B041,
 
 [pytest]
 addopts = --verbose --strict --showlocals