Merge branch 'main' into doc_crowdin

Author: tkoyama010

.github/workflows/create-translations-pr.yml

@@ -0,0 +1,61 @@
+name: Create Translations PR
+
+on:
+  workflow_dispatch:
+    inputs:
+      language_code:
+        description: 'Crowdin language code for the language of interest'
+        required: true
+
+jobs:
+  create-translations-pr:
+    runs-on: ubuntu-latest
+    # Run only on main branch in upstream repo.
+    if: ${{ github.repository == 'numpy/numpy.org' && github.ref == 'refs/heads/main' }}
+    steps:
+      - name: Checkout numpy.org
+        uses: actions/checkout@v4
+        with:
+          repository: 'numpy/numpy.org'
+          path: 'numpy.org'
+          ref: 'main'
+          fetch-depth: 0  # Gets full github history.
+          # Full history is needed for the scripted interactive rebase
+          # which takes place in create_branch_for_language.sh below.
+          persist-credentials: false
+
+      - name: Checkout scientific-python-translations automations
+        uses: actions/checkout@v4
+        with:
+          repository: 'scientific-python-translations/automations'
+          path: 'automations'
+          ref: 'main'
+          persist-credentials: false
+
+      - name: Create translations branch for language of interest
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          LANG: ${{ github.event.inputs.language_code }}
+        run: |
+          git config --global user.email "[email protected]"
+          git config --global user.name "GitHub Actions"
+          ../automations/scripts/create_branch_for_language.sh origin main l10n_main "$LANG"
+          branch_name=$(git rev-parse --abbrev-ref HEAD)
+          git push -u origin "$branch_name"
+          echo "BRANCH_NAME=$branch_name" >> $GITHUB_ENV
+        working-directory: ./numpy.org
+
+      - name: Create Pull Request
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          BRANCH_NAME: ${{ env.BRANCH_NAME }}
+          LANG: ${{ github.event.inputs.language_code }}
+        run: |
+          language_name=$(../automations/scripts/get_language_name.sh "$LANG")
+          gh pr create --base main --head "$BRANCH_NAME" --title "Update translations for $language_name" \
+          --body "This PR to update translations for $language_name was generated by the GitHub workflow, \
+          auto-translations-pr.yml and includes all commits from this repo's Crowdin branch for the language \
+          of interest. A final check of the rendered docs is needed to identify if there are any formatting \
+          errors due to incorrect string segmentation by Crowdin. If there are such formatting errors, they \
+          should be fixed directly on this branch, not through Crowdin."
+        working-directory: ./numpy.org

.github/workflows/gh-pages.yml

@@ -21,27 +21,44 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
+          persist-credentials: false
           submodules: recursive
           fetch-depth: 0
 
       - name: Read Hugo version
         id: hugo-version
         run: cat netlify.toml | grep HUGO_VERSION | tr -d ' "' >> "$GITHUB_OUTPUT"
 
+      - name: Read DART SASS version
+        id: dart-sass-version
+        run: cat netlify.toml | grep --max-count=1 DART_SASS_VERSION | tr -d ' "' >> "$GITHUB_OUTPUT"
+
       - name: Install Hugo CLI
         env:
           HUGO_VERSION: ${{ steps.hugo-version.outputs.HUGO_VERSION }}
         run: |
-          wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb \
-          && sudo dpkg -i ${{ runner.temp }}/hugo.deb
+          wget -O /tmp/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb \
+          && sudo dpkg -i /tmp/hugo.deb
+
+      - name: Install Dart Sass
+        env:
+          DART_SASS_VERSION: ${{ steps.dart-sass-version.outputs.DART_SASS_VERSION }}
+          DART_SASS_URL: "https://github.com/sass/dart-sass/releases/download/"
+        run: |
+          export DART_SASS_TARBALL="dart-sass-${DART_SASS_VERSION}-linux-x64.tar.gz" && \
+          curl -LJO ${DART_SASS_URL}/${DART_SASS_VERSION}/${DART_SASS_TARBALL} && \
+          tar -xf ${DART_SASS_TARBALL} && \
+          rm ${DART_SASS_TARBALL}
 
       - name: Generate config
         run: python gen_config.py
 
       - name: Build with Hugo
-        run: hugo --gc --minify
+        run: |
+          export PATH=$(pwd)/dart-sass:$PATH
+          hugo --gc --minify
 
       - name: Deploy pages
         uses: JamesIves/github-pages-deploy-action@releases/v4

Makefile

@@ -18,26 +18,29 @@ prepare:
 	git submodule update --init
 	python gen_config.py
 
-TEAMS_DIR = static/gallery
+# All translations share the <team>.toml files in the en translation
+TEAMS_DIR = content/en/teams
 TEAMS = emeritus-maintainers maintainers docs-team triage-team survey-team web-team
 TEAMS_QUERY = python themes/scientific-python-hugo-theme/tools/team_query.py
 
-$(TEAMS_DIR):
-	mkdir -p $(TEAMS_DIR)
-
-$(TEAMS_DIR)/%.md: $(TEAMS_DIR)
-	$(TEAMS_QUERY) --org numpy --team "$*"  >  $(TEAMS_DIR)/$*.html
+$(TEAMS_DIR)/%.toml:
+	$(TEAMS_QUERY) --org numpy --team "$*"  >  $(TEAMS_DIR)/$*.toml
 
 teams-clean: prepare
 	for team in $(TEAMS); do \
-	  rm -f $(TEAMS_DIR)/$${team}.html ;\
+	  rm -f $(TEAMS_DIR)/$${team}.toml ;\
 	done
 
-teams: | teams-clean $(patsubst %,$(TEAMS_DIR)/%.md,$(TEAMS)) ## generates numpy.org team gallery pages
+teams: | teams-clean $(patsubst %,$(TEAMS_DIR)/%.toml,$(TEAMS)) ## generates numpy.org team gallery pages
 
 serve: prepare ## serve the website
 	hugo $(BASEURLARG) --printI18nWarnings server -D
 
+# Serve the site for development purposes (leaving submodules as-is, etc).
+serve-dev:
+	python gen_config.py
+	hugo $(BASEURLARG) --printI18nWarnings server --buildDrafts --disableFastRender --poll 1000ms
+
 html: prepare ## build the website in ./public
 	hugo $(BASEURLARG)
 

assets/css/casestudies.css

@@ -2,11 +2,6 @@
     padding: 30px;
 }
 
-.casestudies a:hover {
-    text-decoration: none;
-    color:black
-}
-
 .casestudies-title {
     display: flex;
     justify-content: center;
@@ -28,10 +23,6 @@
     border-radius: 3px;
 }
 
-.casestudies a {
-    color: var(--colorPrimaryDark) !important;
-}
-
 .casestudies-box-title {
     margin: 15px;
     font-size: 16px;
@@ -58,11 +49,10 @@
 
 .casestudies-underline {
     display: inline-block;
-    vertical-align: middle;
     -webkit-transform: perspective(1px) translateZ(0);
     transform: perspective(1px) translateZ(0);
-    /* Black, with 10% opacity */
-    box-shadow: 0px 8px 15px rgba(0, 0, 0, 0.1);
+    border: .02em solid var(--pst-color-border);
+    box-shadow: 0 .2rem .5rem var(--pst-color-shadow),0 0 .0625rem var(--pst-color-shadow);
     position: relative;
     overflow: hidden;
 }
@@ -74,7 +64,6 @@
     left: 0;
     right: 100%;
     bottom: 0;
-    background: var(--colorPrimaryDark);
     height: 4px;
     -webkit-transition-property: right;
     transition-property: right;

assets/css/custom.css

@@ -0,0 +1,4 @@
+.hero-title,
+.navbar-logo-text {
+  font-family: "Lato";
+}

assets/css/mailchimp.css

@@ -11,28 +11,29 @@
 }
 
 .sign-up-image {
+  height: 35px;
   padding: 5px 10px 6px 10px;
-  border-right: 1px solid var(--colorSecondary);
-  background-color: var(--colorSecondary);
+  border-right: 1px solid var(--spht-color-dark);
+  background-color: var(--spht-color-light);
   border-radius: 5px 0 0 5px;
 }
 
 #footer .sign-up-image svg.icon {
-  fill: var(--colorPrimaryDark);
+  fill: var(--spht-color-dark);
   width: 1.25rem;
   height: 1.25rem;
   padding-bottom: 2px;
 }
 
 .sign-up-input {
-  background-color: var(--colorSecondary);
+  background-color: var(--spht-color-light);
   border-radius: 0 5px 5px 0;
   border: none;
   width: 75%;
   height: 35px;
   padding-left: 5px;
   font-size: 14px;
-  color: var(--colorPrimaryDark);
+  color: var(--spht-color-dark);
 }
 
 .submission-instructions {
@@ -47,7 +48,7 @@
 }
 
 #footer .signup-button svg.icon {
-  fill: var(--colorPrimaryDark);
+  fill: var(--spht-color-dark);
   width: 1.6rem;
   height: 1.6rem;
   padding-bottom: 2px;
@@ -57,9 +58,9 @@
 .thank-you {
   display: none;
   height: 75px;
-  color: var(--colorSecondary);
+  color: var(--spht-color-light);
   align-items: center;
-  color: var(--colorSecondary);
+  color: var(--spht-color-light);
 }
 
 @media only screen and (max-width: 1150px) {

assets/css/shell.css

@@ -1,10 +1,8 @@
 .hero-right {
     display: flex;
     flex-direction: column;
-    /* Black, with 10% opacity */
-    box-shadow: 0px 8px 15px rgba(0, 0, 0, 0.1);
-    background: rgb(238, 238, 238);
     padding: 15px;
+    background: var(--pst-color-surface);
 }
 
 .numpy-shell-canvas {
@@ -24,7 +22,7 @@
 
 .numpy-shell {
     flex: 2;
-    padding: 0 15px;
+    border: 1px solid var(--pst-color-border);
 }
 
 .shell-title-container {
@@ -48,9 +46,14 @@
 }
 
 .shell-lesson .highlight pre {
+    background-color: var(--pst-gray-800);
     height: 100%;
 }
 
+.shell-lesson .highlight pre code{
+    color: #f3c7ee;
+}
+
 .shell-lesson > p {
     margin: 2px 0 2px 0;
 }