@gen3/workspaces 0.12.62 → 0.12.64

package/scripts/build-gen3sdk-lite_v2.sh

@@ -0,0 +1,310 @@
+#!/usr/bin/env bash
+# =============================================================================
+# build-gen3sdk-lite.sh — Build Gen3 SDK and dependencies as WASM wheels
+#
+# Prerequisites:
+#   - uv  (https://docs.astral.sh/uv/getting-started/installation/)
+#   - git
+#   - cmake, make, and a C compiler (for emsdk bootstrap)
+#
+# Usage:
+#   ./build-gen3sdk-lite.sh            # full build (setup + all packages)
+#   ./build-gen3sdk-lite.sh --setup    # environment setup only
+#   ./build-gen3sdk-lite.sh --build    # build wheels only (assumes setup done)
+#   ./build-gen3sdk-lite.sh --clean    # remove cloned repos, build artifacts
+# =============================================================================
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+# ── Configuration ────────────────────────────────────────────────────────────
+# Repositories to build (order matters — independent packages first)
+# Format: "name|git_url|subdir"  (subdir is optional)
+REPOS=(
+  "cdislogging|https://github.com/uc-cdis/cdislogging.git"
+  "python-json-logger|https://github.com/nhairs/python-json-logger.git"
+  "fastavro|https://github.com/fastavro/fastavro.git"
+  "drsclient|https://github.com/uc-cdis/drsclient.git"
+  "indexd|https://github.com/uc-cdis/indexd.git|indexclient"
+  "dictionaryutils|https://github.com/uc-cdis/dictionaryutils.git"
+  "pypfb|https://github.com/uc-cdis/pypfb.git"
+  "gen3sdk-python|https://github.com/uc-cdis/gen3sdk-python.git"
+  "gen3users|git@github.com:uc-cdis/gen3users.git"
+)
+
+# ── Source shared environment ────────────────────────────────────────────────
+# setup-env.sh exports: ROOT_DIR, SRC_DIR, BUILD_DIR, VENV_DIR, WORK_DIR,
+# EMSDK_DIR, SOURCES_DIR, OUTPUT_DIR, LOG_DIR and helper functions.
+# It also creates + activates the venv and installs core tooling.
+source_shared_env() {
+  # shellcheck disable=SC1091
+  source "${SCRIPT_DIR}/setup-env.sh"
+}
+
+# ── Emscripten SDK ───────────────────────────────────────────────────────────
+setup_emsdk() {
+  info "Setting up Emscripten SDK …"
+
+  if [[ ! -d "${EMSDK_DIR}" ]]; then
+    git clone https://github.com/emscripten-core/emsdk.git "${EMSDK_DIR}"
+  fi
+
+  local em_version
+  em_version="$(pyodide config get emscripten_version)"
+  info "Pyodide requires Emscripten ${em_version}"
+
+  pushd "${EMSDK_DIR}" > /dev/null
+  ./emsdk install "${em_version}"
+  ./emsdk activate "${em_version}"
+  # shellcheck disable=SC1091
+  source emsdk_env.sh
+  popd > /dev/null
+
+  success "Emscripten $(emcc --version | head -1) activated"
+}
+
+# ── Full environment setup ───────────────────────────────────────────────────
+setup_environment() {
+  source_shared_env
+  mkdir -p "${WORK_DIR}" "${SOURCES_DIR}" "${OUTPUT_DIR}" "${LOG_DIR}"
+
+  # WASM-specific tooling (on top of the shared base)
+  info "Installing pyodide-build …"
+  uv pip install pyodide-build 2>&1 | tail -3
+  success "pyodide-build $(pyodide --version 2>/dev/null || echo '(installed)')"
+
+  setup_emsdk
+}
+
+# ── Clone / update sources ──────────────────────────────────────────────────
+clone_repos() {
+  info "Cloning / updating repositories …"
+  for entry in "${REPOS[@]}"; do
+    IFS='|' read -r name url _subdir <<< "${entry}"
+    local dest="${SOURCES_DIR}/${name}"
+    if [[ -d "${dest}/.git" ]]; then
+      info "  ${name}: pulling latest …"
+      git -C "${dest}" pull --ff-only 2>&1 | tail -1
+    else
+      info "  ${name}: cloning …"
+      git clone "${url}" "${dest}" 2>&1 | tail -1
+    fi
+  done
+  success "All repositories ready"
+}
+
+# ── Build WASM wheels ───────────────────────────────────────────────────────
+build_wheels() {
+  # Make sure emsdk env is active in this shell
+  if [[ -f "${EMSDK_DIR}/emsdk_env.sh" ]]; then
+    # shellcheck disable=SC1091
+    source "${EMSDK_DIR}/emsdk_env.sh" 2>/dev/null
+  fi
+  # shellcheck disable=SC1091
+  source "${VENV_DIR}/bin/activate"
+
+  local total=${#REPOS[@]}
+  local built=0
+  local failed=0
+  local failed_names=()
+
+  # ── Source patches ─────────────────────────────────────────────────────
+
+  # gen3users: old poetry.masonry.api → poetry.core.masonry.api
+  local gen3users_pyproject="${SOURCES_DIR}/gen3users/pyproject.toml"
+  if [[ -f "${gen3users_pyproject}" ]]; then
+    sed -i '' 's|build-backend = "poetry.masonry.api"|build-backend = "poetry.core.masonry.api"|' "${gen3users_pyproject}"
+    info "Patched gen3users: build-backend updated to poetry.core.masonry.api"
+  fi
+
+  # gen3sdk-python: relax indexclient pin
+  local gen3sdk_pyproject="${SOURCES_DIR}/gen3sdk-python/pyproject.toml"
+  if [[ -f "${gen3sdk_pyproject}" ]]; then
+    sed -i '' 's/indexclient = "\^2\.3\.0"/indexclient = ">=2.3.0"/' "${gen3sdk_pyproject}"
+    info "Patched gen3sdk-python: indexclient constraint relaxed to >=2.3.0"
+  fi
+
+  # dictionaryutils: relax jsonschema pin
+  local dictionaryutils_pyproject="${SOURCES_DIR}/dictionaryutils/pyproject.toml"
+  if [[ -f "${dictionaryutils_pyproject}" ]]; then
+    sed -i '' 's/jsonschema = "<=4\.23\.0"/jsonschema = ">=4.0.0"/' "${dictionaryutils_pyproject}"
+    info "Patched dictionaryutils: jsonschema constraint relaxed to >=4.0.0"
+  fi
+
+  # psqlgraph: multiple fixes for WASM compatibility
+  local psqlgraph_pyproject="${SOURCES_DIR}/psqlgraph/pyproject.toml"
+  if [[ -f "${psqlgraph_pyproject}" ]]; then
+    sed -i '' 's/"sqlalchemy~=1\.4"/"sqlalchemy>=1.4"/' "${psqlgraph_pyproject}"
+    sed -i '' 's/, "versionista>=1\.1\.0"//' "${psqlgraph_pyproject}"
+    sed -i '' 's/local_scheme = "versionista-local-format"/local_scheme = "no-local-version"/' "${psqlgraph_pyproject}"
+    sed -i '' 's/version_scheme = "versionista-format"/version_scheme = "guess-next-dev"/' "${psqlgraph_pyproject}"
+    sed -i '' '/"psycopg2"/d' "${psqlgraph_pyproject}"
+    sed -i '' '/"xlocal"/d' "${psqlgraph_pyproject}"
+    info "Patched psqlgraph: sqlalchemy >=1.4, removed versionista + psycopg2 + xlocal"
+
+    local psql_py="${SOURCES_DIR}/psqlgraph/src/psqlgraph/psql.py"
+    if [[ -f "${psql_py}" ]]; then
+      python3 - "${psql_py}" <<'PYEOF'
+import sys, re
+
+path = sys.argv[1]
+text = open(path).read()
+stub = '''\
+try:
+    import xlocal
+except ImportError:
+    class _XLocalInst:
+        class _Ctx:
+            def __init__(self, parent, **kw):
+                self._parent, self._kw = parent, kw
+            def __enter__(self):
+                for k, v in self._kw.items():
+                    setattr(self._parent, k, v)
+                return self._parent
+            def __exit__(self, *a):
+                for k in self._kw:
+                    self._parent.__dict__.pop(k, None)
+        def __call__(self, **kw):
+            return self._Ctx(self, **kw)
+    class _xlocal_module:
+        xlocal = _XLocalInst
+    xlocal = _xlocal_module()'''
+text = re.sub(r'^import xlocal$', stub, text, flags=re.MULTILINE)
+open(path, 'w').write(text)
+PYEOF
+      info "Patched psqlgraph/psql.py: xlocal import wrapped in try/except stub"
+    fi
+  fi
+
+  # ── Build loop ─────────────────────────────────────────────────────────
+  info "Building ${total} packages …"
+  echo ""
+
+  for entry in "${REPOS[@]}"; do
+    IFS='|' read -r name _url subdir <<< "${entry}"
+    local src="${SOURCES_DIR}/${name}"
+    local build_dir="${src}"
+    [[ -n "${subdir}" ]] && build_dir="${src}/${subdir}"
+    local logfile="${LOG_DIR}/${name}.log"
+    local start_ts
+    start_ts=$(date +%s)
+
+    local label="${name}"
+    [[ -n "${subdir}" ]] && label="${name}/${subdir}"
+    printf "  [%d/%d] %-25s " $((built + failed + 1)) "${total}" "${label}"
+
+    if (cd "${build_dir}" && pyodide build) > "${logfile}" 2>&1; then
+      local end_ts
+      end_ts=$(date +%s)
+      echo -e "${GREEN}OK${NC}  ($(elapsed $((end_ts - start_ts))))"
+      ((built++))
+    else
+      local end_ts
+      end_ts=$(date +%s)
+      echo -e "${RED}FAILED${NC}  ($(elapsed $((end_ts - start_ts)))) — see ${logfile}"
+      ((failed++))
+      failed_names+=("${name}")
+    fi
+  done
+
+  echo ""
+
+  # ── Collect wheels ─────────────────────────────────────────────────────
+  info "Collecting .whl files into ${OUTPUT_DIR} …"
+  local count=0
+  for entry in "${REPOS[@]}"; do
+    IFS='|' read -r name _url subdir <<< "${entry}"
+    local src="${SOURCES_DIR}/${name}"
+    local build_dir="${src}"
+    [[ -n "${subdir}" ]] && build_dir="${src}/${subdir}"
+    if compgen -G "${build_dir}/dist/*.whl" > /dev/null 2>&1; then
+      cp "${build_dir}"/dist/*.whl "${OUTPUT_DIR}/"
+      ((count += $(ls -1 "${build_dir}"/dist/*.whl 2>/dev/null | wc -l)))
+    fi
+  done
+
+  # ── Normalise platform tags ────────────────────────────────────────────
+  for whl in "${OUTPUT_DIR}"/*p313-cp313-pyemscripten_2025_0_wasm32.whl; do
+    [[ -f "${whl}" ]] || continue
+    new_whl="${whl/p313-cp313-pyemscripten_2025_0_wasm32/py3-none-any}"
+    mv "${whl}" "${new_whl}"
+    info "Renamed $(basename "${whl}") → $(basename "${new_whl}")"
+  done
+
+  # ── Summary ────────────────────────────────────────────────────────────
+  echo ""
+  echo "========================================="
+  echo "  Build Summary"
+  echo "========================================="
+  echo "  Succeeded : ${built}"
+  echo "  Failed    : ${failed}"
+  echo "  Wheels    : ${count} file(s) in ${OUTPUT_DIR}/"
+  if (( failed > 0 )); then
+    echo ""
+    echo "  Failed packages:"
+    for n in "${failed_names[@]}"; do
+      echo "    - ${n}  (log: ${LOG_DIR}/${n}.log)"
+    done
+  fi
+  echo "========================================="
+  echo ""
+
+  if (( failed > 0 )); then
+    warn "Some packages failed. Check the logs above."
+    return 1
+  fi
+
+  success "All wheels built and collected in ${OUTPUT_DIR}/"
+  echo ""
+  ls -lh "${OUTPUT_DIR}"/*.whl
+}
+
+# ── Clean ────────────────────────────────────────────────────────────────────
+clean() {
+  # Need the path variables but don't need the full env setup
+  ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+  SRC_DIR="$ROOT_DIR/free-private"
+  BUILD_DIR="${2:-$SRC_DIR/build}"
+  WORK_DIR="$BUILD_DIR/work"
+  OUTPUT_DIR="$BUILD_DIR/pypi"
+  LOG_DIR="$BUILD_DIR/logs"
+
+  echo -e '\033[0;36m[INFO]\033[0m  Cleaning build artifacts …'
+  rm -rf "${WORK_DIR}" "${OUTPUT_DIR}" "${LOG_DIR}"
+  echo -e '\033[0;32m[OK]\033[0m    Clean complete'
+}
+
+# ── Main ─────────────────────────────────────────────────────────────────────
+main() {
+  local mode="${1:-all}"
+
+  case "${mode}" in
+    --setup)
+      setup_environment
+      ;;
+    --build)
+      source_shared_env
+      clone_repos
+      build_wheels
+      ;;
+    --clean)
+      clean
+      ;;
+    --help|-h)
+      echo "Usage: $0 [--setup | --build | --clean | --help]"
+      echo ""
+      echo "  (no flag)   Full run: setup environment, clone repos, build wheels"
+      echo "  --setup     Set up Python, venv, pyodide-build, and emsdk"
+      echo "  --build     Clone/update repos and build WASM wheels (requires prior --setup)"
+      echo "  --clean     Remove work/, dist/, and logs/"
+      echo "  --help      Show this message"
+      ;;
+    *)
+      setup_environment
+      clone_repos
+      build_wheels
+      ;;
+  esac
+}
+
+main "$@"

package/scripts/build-jupyterlite.sh

@@ -50,8 +50,17 @@ if [[ ! -x "$VENV_JUPYTER_LITE" ]]; then
   exit 1
 fi
 
+
+echo "$VENV_JUPYTER_LITE" build \
+       --config "$CONFIG_FILE" \
+       --lite-dir "$SRC_DIR" \
+       --output-dir "$BUILD_DIR/$TIER"
+
 "$VENV_JUPYTER_LITE" build \
   --config "$CONFIG_FILE" \
+  --lite-dir "$SRC_DIR" \
   --output-dir "$BUILD_DIR/$TIER"
 
+
+
 echo "$TIER-tier JupyterLite build complete: $BUILD_DIR/$TIER (venv: $VENV_DIR)"

package/scripts/build-jupyterlite_v2.sh

@@ -0,0 +1,111 @@
+#!/usr/bin/env bash
+# =============================================================================
+# build-jupyterlite.sh — Build a JupyterLite site (free or remote tier)
+#
+# Sources setup-env.sh so the venv, Python version, and tooling are identical
+# to those used by build-gen3sdk-lite.sh.
+#
+# Usage:
+#   ./build-jupyterlite.sh <tier> [build_dir]
+#     tier: 'free' or 'remote'
+# =============================================================================
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+usage() {
+  echo "Usage: $0 <tier> [build_dir]"
+  echo "  tier: 'free' or 'remote'"
+  exit 1
+}
+
+TIER="${1:-}"
+if [[ "$TIER" != "free" && "$TIER" != "remote" ]]; then
+  usage
+fi
+
+# ── Derive SRC_DIR before sourcing shared env ────────────────────────────────
+# setup-env.sh respects pre-set ROOT_DIR / SRC_DIR / BUILD_DIR.
+export ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+
+if [[ "$TIER" == "free" ]]; then
+  export SRC_DIR="$ROOT_DIR/free-private"
+else
+  export SRC_DIR="$ROOT_DIR/remote-private"
+fi
+
+# Allow caller to override BUILD_DIR via the second positional arg.
+if [[ -n "${2:-}" ]]; then
+  export BUILD_DIR="$2"
+fi
+
+# ── Source shared environment (creates/reuses the venv) ──────────────────────
+# After this: VENV_DIR, OUTPUT_DIR, BUILD_DIR, etc. are set and the venv is
+# active with the same Python version + core tooling as build-gen3sdk-lite.
+# shellcheck disable=SC1091
+source "${SCRIPT_DIR}/setup-env.sh"
+
+# ── JupyterLite-specific tooling ────────────────────────────────────────────
+CONFIG_FILE="$SRC_DIR/jupyter_lite_config.json"
+REQUIREMENTS_FILE="$SRC_DIR/requirements.txt"
+VENV_JUPYTER_LITE="$VENV_DIR/bin/jupyter-lite"
+PYPI="$OUTPUT_DIR"   # wheels built by build-gen3sdk-lite land here
+
+if [[ ! -f "$REQUIREMENTS_FILE" ]]; then
+  echo "Missing requirements file: $REQUIREMENTS_FILE"
+  exit 1
+fi
+
+# Install JupyterLite requirements into the shared venv (uv for speed).
+info "Installing JupyterLite requirements …"
+uv pip install -r "$REQUIREMENTS_FILE" 2>&1 | tail -5
+success "JupyterLite requirements installed"
+
+if [[ ! -x "$VENV_JUPYTER_LITE" ]]; then
+  echo "jupyter-lite executable not found in $VENV_DIR after dependency install."
+  exit 1
+fi
+
+# ── Build ────────────────────────────────────────────────────────────────────
+if [[ "$TIER" == "free" ]]; then
+
+  # Patch config to use the absolute pypi path so jupyter-lite can find the
+  # custom wheels built by build-gen3sdk-lite.
+  PATCHED_CONFIG="$BUILD_DIR/jupyter_lite_config.json"
+  python - <<PYEOF
+import json
+
+with open('$CONFIG_FILE') as fh:
+    cfg = json.load(fh)
+
+addon = cfg.get('PyodideLockAddon', {})
+if 'wheels' in addon:
+    addon['wheels'] = ['$PYPI/']
+    cfg['PyodideLockAddon'] = addon
+
+with open('$PATCHED_CONFIG', 'w') as fh:
+    json.dump(cfg, fh, indent=2)
+PYEOF
+
+  info "Looking for wheels in $PYPI"
+  WHEEL_ARGS=()
+  if [[ -d "$PYPI" ]]; then
+    while IFS= read -r -d '' whl; do
+      WHEEL_ARGS+=(--piplite-wheels "$whl")
+    done < <(find "$PYPI" -maxdepth 1 -name "*.whl" -print0 | sort -z)
+  fi
+
+  info "Running: jupyter-lite build (free tier, ${#WHEEL_ARGS[@]} custom wheels)"
+  "$VENV_JUPYTER_LITE" build \
+    --config "$PATCHED_CONFIG" \
+    --lite-dir "$SRC_DIR" ${WHEEL_ARGS[@]+"${WHEEL_ARGS[@]}"} \
+    --output-dir "$BUILD_DIR/$TIER"
+else
+  info "Running: jupyter-lite build (remote tier)"
+  "$VENV_JUPYTER_LITE" build \
+    --config "$CONFIG_FILE" \
+    --lite-dir "$SRC_DIR" \
+    --output-dir "$BUILD_DIR/$TIER"
+fi
+
+success "$TIER-tier JupyterLite build complete: $BUILD_DIR/$TIER"

package/LICENSE

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.