girder 5.0.11.dev31__tar.gz → 5.0.11.dev33__tar.gz

{girder-5.0.11.dev31 → girder-5.0.11.dev33}/.circleci/config.yml

@@ -439,16 +439,15 @@ workflows:
             tags:
               only: /^v[0-9]+.*/
       - check-publish:
-          requires:
-            - server-lint-test
-            - web-lint-test
-            - coverage
           filters:
             tags:
               only: /^v[0-9]+.*/
       - publish:
           requires:
             - check-publish
+            - server-lint-test
+            - web-lint-test
+            - coverage
           filters:
             tags:
               only: /^v[0-9]+.*/
@@ -459,6 +458,9 @@ workflows:
       - publish-release:
           requires:
             - check-publish
+            - server-lint-test
+            - web-lint-test
+            - coverage
           filters:
             tags:
               only: /^v[0-9]+.*/

{girder-5.0.11.dev31 → girder-5.0.11.dev33}/.circleci/publish_pypi.sh

@@ -1,12 +1,7 @@
 #!/bin/bash
 set -e
 
-pushd girder/web
-npm ci
-SKIP_SOURCE_MAPS=true npm run build
-popd
-
-python .circleci/build_plugins.py plugins/
+python .circleci/build_plugins.py plugins --extra girder/web
 
 # Build and publish all Python packages in this repo
 readonly PUBLISHED_PYTHON_PACKAGES=(
@@ -17,10 +12,15 @@ readonly PUBLISHED_PYTHON_PACKAGES=(
   worker
 )
 for directory in "${PUBLISHED_PYTHON_PACKAGES[@]}"; do
+    echo ==================== "$directory" ====================
     pushd "$directory"
     rm -fr dist
+    echo "====== build $directory"
     python -m build
+    echo "====== wheel $directory"
     pip wheel . --no-deps -w dist
+    echo "====== twine $directory"
     twine ${1:-check} $( [[ "${1:-check}" == "upload" ]] && printf %s '--verbose' ) $( [[ "${1:-check}" == "upload" ]] && printf %s '--skip-existing' ) dist/*
+    echo "====== done $directory"
     popd
 done

{girder-5.0.11.dev31 → girder-5.0.11.dev33}/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.6)
+cmake_minimum_required(VERSION 3.5.0)
 
 project(Girder NONE)
 

{girder-5.0.11.dev31/girder.egg-info → girder-5.0.11.dev33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: girder
-Version: 5.0.11.dev31
+Version: 5.0.11.dev33
 Summary: Web-based data management platform
 Home-page: https://girder.readthedocs.org
 Author: Kitware, Inc.

{girder-5.0.11.dev31 → girder-5.0.11.dev33}/clients/python/setup.py

@@ -35,7 +35,7 @@ with open('README.rst') as f:
 # perform the install
 setup(
     name='girder-client',
-    use_scm_version={'root': '../..', 'local_scheme': prerelease_local_scheme},
+    use_scm_version={'search_parent_directories': True, 'local_scheme': prerelease_local_scheme},
     setup_requires=[
         'setuptools-scm',
     ],

{girder-5.0.11.dev31 → girder-5.0.11.dev33}/docs/plugin-development.rst

@@ -61,8 +61,8 @@ package we are going to create.
       include_package_data=True,
       packages=find_packages(exclude=['plugin_tests']),
       zip_safe=False,
-      setup_requires=['setuptools-git'],
-      install_requires=['girder>=3', 'girder-jobs'],
+      setup_requires=['setuptools-scm'],
+      install_requires=['girder>=5', 'girder-jobs'],
       entry_points={
           'girder.plugin': [ 'cats = girder_cats:CatsPlugin' ]
       }
@@ -80,7 +80,7 @@ in this example are specific to a Girder plugin.  These are as follows:
     `setuptools documentation <https://setuptools.readthedocs.io/en/latest/setuptools.html#including-data-files>`_
     for details.
 
-``setup_requires=['setuptools-git']``
+``setup_requires=['setuptools-scm']``
     This works with the ``include_package_data`` option to automatically include all non-python
     files that are checked into your git repository.  Alternatively, you can generate a
     ``MANIFEST.in`` for more fine-grained control over which files are included.