From d5db91241a32a5e6e1459473666d9ce4276aaa4a Mon Sep 17 00:00:00 2001 From: kushalbakshi Date: Tue, 21 Feb 2023 14:36:22 -0600 Subject: [PATCH 1/6] Fix readability of tutorials in dark mode --- CHANGELOG.md | 3 +++ datajoint/version.py | 2 +- docs/src/.overrides/assets/stylesheets/extra.css | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e107b29bb..99527444c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ## Release notes +### 0.14.1 -- Feb 21, 2023 +- Fixed - .ipynb output in tutorials is not visible in dark mode ([#1078](https://github.com/datajoint/datajoint-python/issues/1078)) + ### 0.14.0 -- Feb 13, 2023 - Added - `json` data type ([#245](https://github.com/datajoint/datajoint-python/issues/245)) PR [#1051](https://github.com/datajoint/datajoint-python/pull/1051) - Fixed - Activating a schema requires all tables to exist even if `create_tables=False` PR [#1058](https://github.com/datajoint/datajoint-python/pull/1058) diff --git a/datajoint/version.py b/datajoint/version.py index 697137322..39e423564 100644 --- a/datajoint/version.py +++ b/datajoint/version.py @@ -1,3 +1,3 @@ -__version__ = "0.14.0" +__version__ = "0.14.1" assert len(__version__) <= 10 # The log table limits version to the 10 characters diff --git a/docs/src/.overrides/assets/stylesheets/extra.css b/docs/src/.overrides/assets/stylesheets/extra.css index 46b6aa597..b1e2a6125 100644 --- a/docs/src/.overrides/assets/stylesheets/extra.css +++ b/docs/src/.overrides/assets/stylesheets/extra.css @@ -91,3 +91,7 @@ html a[title="YouTube"].md-social__link svg { /* previous/next text */ /* --md-footer-fg-color: var(--dj-white); */ } + +[data-md-color-scheme="slate"] .jupyter-wrapper .Table td { + color: var(--dj-primary); +} \ No newline at end of file From 97d1e53963958acac00742025128fe50e1a1d175 Mon Sep 17 00:00:00 2001 From: kushalbakshi Date: Tue, 21 Feb 2023 14:44:44 -0600 Subject: [PATCH 2/6] Update CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 99527444c..49125d42d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ ## Release notes ### 0.14.1 -- Feb 21, 2023 -- Fixed - .ipynb output in tutorials is not visible in dark mode ([#1078](https://github.com/datajoint/datajoint-python/issues/1078)) +- Fixed - .ipynb output in tutorials is not visible in dark mode ([#1078](https://github.com/datajoint/datajoint-python/issues/1078) PR [#1080](https://github.com/datajoint/datajoint-python/pull/1080)) ### 0.14.0 -- Feb 13, 2023 - Added - `json` data type ([#245](https://github.com/datajoint/datajoint-python/issues/245)) PR [#1051](https://github.com/datajoint/datajoint-python/pull/1051) From e04948056d20fa29525b7c33b80a1b4ee41425f8 Mon Sep 17 00:00:00 2001 From: Kushal Bakshi <52367253+kushalbakshi@users.noreply.github.com> Date: Thu, 9 Mar 2023 11:21:26 -0600 Subject: [PATCH 3/6] Update CHANGELOG.md Co-authored-by: Raphael Guzman <38401847+guzman-raphael@users.noreply.github.com> --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49125d42d..f0d2b652a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ ## Release notes ### 0.14.1 -- Feb 21, 2023 -- Fixed - .ipynb output in tutorials is not visible in dark mode ([#1078](https://github.com/datajoint/datajoint-python/issues/1078) PR [#1080](https://github.com/datajoint/datajoint-python/pull/1080)) +- Fixed - `.ipynb` output in tutorials is not visible in dark mode ([#1078](https://github.com/datajoint/datajoint-python/issues/1078)) PR [#1080](https://github.com/datajoint/datajoint-python/pull/1080) ### 0.14.0 -- Feb 13, 2023 - Added - `json` data type ([#245](https://github.com/datajoint/datajoint-python/issues/245)) PR [#1051](https://github.com/datajoint/datajoint-python/pull/1051) From bef18fffb15341798d1b26f8cac133158fab69f9 Mon Sep 17 00:00:00 2001 From: kushalbakshi Date: Wed, 5 Apr 2023 11:31:59 -0500 Subject: [PATCH 4/6] Add `typing-extension` requirement for docs build --- docs/.docker/pip_requirements.txt | 1 + docs/src/.overrides/assets/stylesheets/extra.css | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/docs/.docker/pip_requirements.txt b/docs/.docker/pip_requirements.txt index e09eef4cc..55d0b909f 100644 --- a/docs/.docker/pip_requirements.txt +++ b/docs/.docker/pip_requirements.txt @@ -1,3 +1,4 @@ +typing-extensions mkdocs-material mkdocs-redirects mkdocstrings diff --git a/docs/src/.overrides/assets/stylesheets/extra.css b/docs/src/.overrides/assets/stylesheets/extra.css index b1e2a6125..c468acbe9 100644 --- a/docs/src/.overrides/assets/stylesheets/extra.css +++ b/docs/src/.overrides/assets/stylesheets/extra.css @@ -15,27 +15,35 @@ html a[title="DataJoint"].md-social__link svg { color: var(--dj-primary); } + html a[title="Slack"].md-social__link svg { color: var(--dj-primary); } + html a[title="LinkedIn"].md-social__link svg { color: var(--dj-primary); } + html a[title="Twitter"].md-social__link svg { color: var(--dj-primary); } + html a[title="GitHub"].md-social__link svg { color: var(--dj-primary); } + html a[title="DockerHub"].md-social__link svg { color: var(--dj-primary); } + html a[title="PyPI"].md-social__link svg { color: var(--dj-primary); } + html a[title="StackOverflow"].md-social__link svg { color: var(--dj-primary); } + html a[title="YouTube"].md-social__link svg { color: var(--dj-primary); } @@ -92,6 +100,6 @@ html a[title="YouTube"].md-social__link svg { /* --md-footer-fg-color: var(--dj-white); */ } -[data-md-color-scheme="slate"] .jupyter-wrapper .Table td { - color: var(--dj-primary); +[data-md-color-scheme="slate"] .jupyter-wrapper .Table Td { + color: var(--dj-black) } \ No newline at end of file From 4224536cdd249475307b123c37e16340759114c2 Mon Sep 17 00:00:00 2001 From: kushalbakshi Date: Thu, 6 Apr 2023 15:45:35 -0500 Subject: [PATCH 5/6] Remove `typing-extensions` from pip_requirements.txt --- docs/.docker/pip_requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/.docker/pip_requirements.txt b/docs/.docker/pip_requirements.txt index 55d0b909f..e09eef4cc 100644 --- a/docs/.docker/pip_requirements.txt +++ b/docs/.docker/pip_requirements.txt @@ -1,4 +1,3 @@ -typing-extensions mkdocs-material mkdocs-redirects mkdocstrings From 696a0804c3b0634e6054c9c07b23c8c3eb4b7553 Mon Sep 17 00:00:00 2001 From: kushalbakshi Date: Thu, 13 Apr 2023 11:34:22 -0500 Subject: [PATCH 6/6] Update nginx version + fix CHANGELOG --- CHANGELOG.md | 4 +--- LNX-docker-compose.yml | 2 +- local-docker-compose.yml | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1823abbe1..10cd62cae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,6 @@ ### Upcoming - Fixed - Fix altering a part table that uses the "master" keyword - PR [#991](https://github.com/datajoint/datajoint-python/pull/991) - -### 0.14.1 -- Apr 05, 2023 - Fixed - `.ipynb` output in tutorials is not visible in dark mode ([#1078](https://github.com/datajoint/datajoint-python/issues/1078)) PR [#1080](https://github.com/datajoint/datajoint-python/pull/1080) ### 0.14.0 -- Feb 13, 2023 @@ -19,7 +17,7 @@ - Deprecated - `table._update()` PR [#1073](https://github.com/datajoint/datajoint-python/pull/1073) - Deprecated - old-style foreign key syntax PR [#1073](https://github.com/datajoint/datajoint-python/pull/1073) - Deprecated - `dj.migrate_dj011_external_blob_storage_to_dj012()` PR [#1073](https://github.com/datajoint/datajoint-python/pull/1073) -* Added - Method to set job keys to "ignore" status - PR [#1068](https://github.com/datajoint/datajoint-python/pull/1068) +- Added - Method to set job keys to "ignore" status - PR [#1068](https://github.com/datajoint/datajoint-python/pull/1068) ### 0.13.8 -- Sep 21, 2022 - Added - New documentation structure based on markdown PR [#1052](https://github.com/datajoint/datajoint-python/pull/1052) diff --git a/LNX-docker-compose.yml b/LNX-docker-compose.yml index e0add9bdd..e1051b4be 100644 --- a/LNX-docker-compose.yml +++ b/LNX-docker-compose.yml @@ -44,7 +44,7 @@ services: interval: 15s fakeservices.datajoint.io: <<: *net - image: datajoint/nginx:v0.2.4 + image: datajoint/nginx:v0.2.5 environment: - ADD_db_TYPE=DATABASE - ADD_db_ENDPOINT=db:3306 diff --git a/local-docker-compose.yml b/local-docker-compose.yml index 0c9d8f218..8b43289d3 100644 --- a/local-docker-compose.yml +++ b/local-docker-compose.yml @@ -46,7 +46,7 @@ services: interval: 15s fakeservices.datajoint.io: <<: *net - image: datajoint/nginx:v0.2.4 + image: datajoint/nginx:v0.2.5 environment: - ADD_db_TYPE=DATABASE - ADD_db_ENDPOINT=db:3306