Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merging main to 2.0.0-beta branch #345

Closed
wants to merge 38 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
f475aa8
fix: Use correct codebuild role (#192)
claytonparnell Mar 4, 2024
166d95b
feature: Add jupyter_ydoc and jupyter_server_fileid (#198)
EvelynYan21 Mar 4, 2024
75def7c
feature: Add OpenSSL FIPS provider (#186)
claytonparnell Mar 4, 2024
4fd13e2
Add installations for cron and less utilities
Feb 29, 2024
b610971
feature: Add dependencies for amazon-sagemaker-sql extension
kumarnzt Mar 6, 2024
d0b3ec7
Added condition to run jupyterlab in RTC mode (#194)
bhupendrasingh Mar 11, 2024
b086e9d
Revert "feature: Add jupyter_ydoc and jupyter_server_fileid (#198)" (…
claytonparnell Mar 12, 2024
3ae1d7e
fix: Fix jupyter-server start script (#245)
bhupendrasingh Mar 12, 2024
34adce2
release: v1.6.0 (#247)
claytonparnell Mar 13, 2024
529a183
feature: Add sagemaker-code-editor package (#185)
aws-prayags Mar 13, 2024
32ffb6e
fix: Fix 1.6.0 release artifacts (#250)
claytonparnell Mar 14, 2024
71f79ec
fix: Fix codebuild authentication (#244)
claytonparnell Mar 14, 2024
17300e1
change: Push to ECR before running tests (#251)
claytonparnell Mar 16, 2024
ecddf40
fix: Updated tests for sagemaker-code-editor (#275)
aws-prayags Mar 19, 2024
68d52e9
change: Updated argument name for sagemaker-distribution image in tes…
aws-prayags Mar 19, 2024
41790a1
fix: Fixes for automated testing (#276)
claytonparnell Mar 19, 2024
4f15658
fix: Improvements for testing (#280)
claytonparnell Mar 19, 2024
f18bd05
release: v1.6.1
github-actions[bot] Mar 20, 2024
6850b93
Adding nightly-build-image.yml to mainline
nikhilumeshsargur Mar 22, 2024
5d2ae7b
Adding nightly-build-image.yml to mainline (#285)
nikhilumeshsargur Mar 22, 2024
fab0a0a
Adding id-token write permissions
nikhilumeshsargur Mar 22, 2024
c19187d
Adding id-token write permissions (#288)
nikhilumeshsargur Mar 22, 2024
fea4081
fix: Increase shm_size for tests (#309)
claytonparnell Mar 25, 2024
1b63b67
Merge branch 'aws:main' into main
nikhilumeshsargur Mar 25, 2024
b2890e1
Set up pre-commit hooks for checking code styles
aws-tianquaw Mar 25, 2024
a74466c
Run code style formetters on all existing files
aws-tianquaw Mar 25, 2024
05d06c7
Add .git-blame-ignore-revs to preserve git blame information
aws-tianquaw Mar 25, 2024
0690182
Fix check code quality workflow
aws-tianquaw Mar 25, 2024
aeddc47
Enabling cron expression for nightly builds
nikhilumeshsargur Mar 26, 2024
5bd579a
Enabling cron expression for nightly builds (#314)
nikhilumeshsargur Mar 26, 2024
0ca170c
release: v1.6.2 (#312)
github-actions[bot] Mar 26, 2024
e575ba5
Remove unnecessary pip install in DEVELOPMENT.md
aws-tianquaw Mar 26, 2024
58e9920
Set up pre-commit hooks and workflows to check code style (#313)
aws-tianquaw Mar 28, 2024
e5b0c93
Add sql-language-server config for LanguageServerManager (#311)
kumarnzt Apr 1, 2024
46490d6
Merge branch '2.0.0-beta' into main
nikhilumeshsargur Apr 1, 2024
657efb5
Fixes for checkstyle
kumarnzt Apr 1, 2024
39a9e42
Fix for isort import checker
kumarnzt Apr 2, 2024
a7b6d3e
Fixes for checkstyle (#346)
nikhilumeshsargur Apr 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feature: Add jupyter_ydoc and jupyter_server_fileid (#198)
EvelynYan21 authored Mar 4, 2024
commit 166d95bb76e6d8cf555d5245b292dffc55d87b4d
2 changes: 2 additions & 0 deletions build_artifacts/v1/v1.6/v1.6.0/cpu.additional_packages_env.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
conda-forge::jupyter_server_fileid
conda-forge::jupyter_ydoc
2 changes: 2 additions & 0 deletions build_artifacts/v1/v1.6/v1.6.0/gpu.additional_packages_env.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
conda-forge::jupyter_server_fileid
conda-forge::jupyter_ydoc
6 changes: 6 additions & 0 deletions test/test_artifacts/v1/jupyter-server-fileid.test.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
ARG COSMOS_IMAGE
FROM $COSMOS_IMAGE

ARG MAMBA_DOCKERFILE_ACTIVATE=1

CMD ["python", "-c", "import jupyter_server_fileid"]
6 changes: 6 additions & 0 deletions test/test_artifacts/v1/jupyter-ydoc.test.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
ARG COSMOS_IMAGE
FROM $COSMOS_IMAGE

ARG MAMBA_DOCKERFILE_ACTIVATE=1

CMD ["python", "-c", "from jupyter_ydoc import YBlob; yblob = YBlob(); assert yblob.get() == b''; yblob.set(b'012'); assert yblob.get() == b'012'"]
8 changes: 6 additions & 2 deletions test/test_dockerfile_based_harness.py
Original file line number Diff line number Diff line change
@@ -38,7 +38,9 @@
("sagemaker-studio-analytics-extension.test.Dockerfile", ['sagemaker-studio-analytics-extension']),
("amazon-codewhisperer-jupyterlab-ext.test.Dockerfile", ['amazon-codewhisperer-jupyterlab-ext']),
("jupyterlab-git.test.Dockerfile", ['jupyterlab-git']),
("serve.test.Dockerfile", ['serve-langchain'])])
("serve.test.Dockerfile", ['serve-langchain']),
("jupyter-server-fileid.test.Dockerfile", ['jupyter_server_fileid']),
("jupyter-ydoc.test.Dockerfile", ['jupyter_ydoc'])])
def test_dockerfiles_for_cpu(dockerfile_path: str, required_packages: List[str],
local_image_version: str, use_gpu: bool):
_validate_docker_images(dockerfile_path, required_packages, local_image_version, use_gpu, 'cpu')
@@ -68,7 +70,9 @@ def test_dockerfiles_for_cpu(dockerfile_path: str, required_packages: List[str],
("sagemaker-studio-analytics-extension.test.Dockerfile", ['sagemaker-studio-analytics-extension']),
("amazon-codewhisperer-jupyterlab-ext.test.Dockerfile", ['amazon-codewhisperer-jupyterlab-ext']),
("jupyterlab-git.test.Dockerfile", ['jupyterlab-git']),
("serve.test.Dockerfile", ['serve-langchain'])])
("serve.test.Dockerfile", ['serve-langchain']),
("jupyter-server-fileid.test.Dockerfile", ['jupyter_server_fileid']),
("jupyter-ydoc.test.Dockerfile", ['jupyter_ydoc'])])
def test_dockerfiles_for_gpu(dockerfile_path: str, required_packages: List[str],
local_image_version: str, use_gpu: bool):
_validate_docker_images(dockerfile_path, required_packages, local_image_version, use_gpu, 'gpu')