Merge pull request #251 from lsst/tickets/DM-43691

DM-43691: Modernize GitHub actions and AASTeX template

project_templates/latex_lsstdoc/EXAMPLE-0/.github/workflows/ci.yaml

@@ -7,13 +7,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # full history for metadata
           submodules: true
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: 3.9
 

project_templates/latex_lsstdoc/EXAMPLE/.github/workflows/ci.yaml

@@ -7,13 +7,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # full history for metadata
           submodules: true
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: 3.9
 

project_templates/latex_lsstdoc/{{cookiecutter.handle}}/.github/workflows/ci.yaml

@@ -7,13 +7,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # full history for metadata
           submodules: true
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: 3.9
 

project_templates/square_pypi_package/example/.github/workflows/periodic-ci.yaml

@@ -19,7 +19,7 @@ jobs:
           - "3.12"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Run tests in tox
         uses: lsst-sqre/run-tox@v1
@@ -33,7 +33,7 @@ jobs:
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Build docs in tox
         uses: lsst-sqre/run-tox@v1
@@ -47,7 +47,7 @@ jobs:
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # full history for setuptools_scm
 

project_templates/square_pypi_package/{{cookiecutter.name}}/.github/workflows/periodic-ci.yaml

@@ -19,7 +19,7 @@ jobs:
           - "3.12"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Run tests in tox
         uses: lsst-sqre/run-tox@v1
@@ -33,7 +33,7 @@ jobs:
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Build docs in tox
         uses: lsst-sqre/run-tox@v1
@@ -47,7 +47,7 @@ jobs:
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # full history for setuptools_scm
 

project_templates/stack_package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change log
 
+## 2024-04-05
+
+- Remove the `--flake8` pytest option.
+- Move pytest configuration to `pyproject.toml`.
+
 ## 2021-04-28
 
 - Switch package Sphinx configuration from `documenteer.sphinxconfig.stackconf` to `documenteer.conf.pipelinespkg` (available in Documenteer 0.6).

project_templates/stack_package/example/.github/workflows/lint.yaml

@@ -1,22 +1,11 @@
 name: lint
 
 on:
-  - push
-  - pull_request
+  push:
+    branches:
+      - main
+  pull_request:
 
 jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.7
-
-      - name: Install
-        run: pip install -r <(curl https://raw.githubusercontent.com/lsst/linting/main/requirements.txt)
-
-      - name: Run linter
-        run: flake8
+  call-workflow:
+    uses: lsst/rubin_workflows/.github/workflows/lint.yaml@main

project_templates/stack_package/example/pyproject.toml

@@ -0,0 +1,3 @@
+# Pytest configuration required to prevent pytest from looking for
+# configurations in parent directories. Can be empty.
+[tool.pytest.ini_options]

project_templates/stack_package/example/setup.cfg

@@ -8,7 +8,3 @@ exclude =
   **/*/__init__.py,
   **/*/version.py,
   tests/.tests
-
-[tool:pytest]
-addopts = --flake8
-flake8-ignore = E133 E226 E228 N802 N803 N806 N812 N813 N815 N816 W503

project_templates/stack_package/example_dataonly/pyproject.toml

@@ -0,0 +1,3 @@
+# Pytest configuration required to prevent pytest from looking for
+# configurations in parent directories. Can be empty.
+[tool.pytest.ini_options]

project_templates/stack_package/example_dds/.github/workflows/lint.yaml

@@ -1,22 +1,11 @@
 name: lint
 
 on:
-  - push
-  - pull_request
+  push:
+    branches:
+      - main
+  pull_request:
 
 jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.7
-
-      - name: Install
-        run: pip install -r <(curl https://raw.githubusercontent.com/lsst/linting/main/requirements.txt)
-
-      - name: Run linter
-        run: flake8
+  call-workflow:
+    uses: lsst/rubin_workflows/.github/workflows/lint.yaml@main

project_templates/stack_package/example_dds/pyproject.toml

@@ -0,0 +1,3 @@
+# Pytest configuration required to prevent pytest from looking for
+# configurations in parent directories. Can be empty.
+[tool.pytest.ini_options]

project_templates/stack_package/example_dds/setup.cfg

@@ -8,7 +8,3 @@ exclude =
   **/*/__init__.py,
   **/*/version.py,
   tests/.tests
-
-[tool:pytest]
-addopts = --flake8
-flake8-ignore = E133 E226 E228 N802 N803 N806 N812 N813 N815 N816 W503

project_templates/stack_package/example_pythononly/.github/workflows/lint.yaml

@@ -1,22 +1,11 @@
 name: lint
 
 on:
-  - push
-  - pull_request
+  push:
+    branches:
+      - main
+  pull_request:
 
 jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.7
-
-      - name: Install
-        run: pip install -r <(curl https://raw.githubusercontent.com/lsst/linting/main/requirements.txt)
-
-      - name: Run linter
-        run: flake8
+  call-workflow:
+    uses: lsst/rubin_workflows/.github/workflows/lint.yaml@main

project_templates/stack_package/example_pythononly/pyproject.toml

@@ -0,0 +1,3 @@
+# Pytest configuration required to prevent pytest from looking for
+# configurations in parent directories. Can be empty.
+[tool.pytest.ini_options]

project_templates/stack_package/example_pythononly/setup.cfg

@@ -8,7 +8,3 @@ exclude =
   **/*/__init__.py,
   **/*/version.py,
   tests/.tests
-
-[tool:pytest]
-addopts = --flake8
-flake8-ignore = E133 E226 E228 N802 N803 N806 N812 N813 N815 N816 W503

project_templates/stack_package/example_standalone/.github/workflows/lint.yaml

@@ -1,22 +1,11 @@
 name: lint
 
 on:
-  - push
-  - pull_request
+  push:
+    branches:
+      - main
+  pull_request:
 
 jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.7
-
-      - name: Install
-        run: pip install -r <(curl https://raw.githubusercontent.com/lsst/linting/main/requirements.txt)
-
-      - name: Run linter
-        run: flake8
+  call-workflow:
+    uses: lsst/rubin_workflows/.github/workflows/lint.yaml@main

project_templates/stack_package/example_standalone/pyproject.toml

@@ -0,0 +1,3 @@
+# Pytest configuration required to prevent pytest from looking for
+# configurations in parent directories. Can be empty.
+[tool.pytest.ini_options]

project_templates/stack_package/example_standalone/setup.cfg

@@ -8,7 +8,3 @@ exclude =
   **/*/__init__.py,
   **/*/version.py,
   tests/.tests
-
-[tool:pytest]
-addopts = --flake8
-flake8-ignore = E133 E226 E228 N802 N803 N806 N812 N813 N815 N816 W503

project_templates/stack_package/example_subpackage/.github/workflows/lint.yaml

@@ -1,22 +1,11 @@
 name: lint
 
 on:
-  - push
-  - pull_request
+  push:
+    branches:
+      - main
+  pull_request:
 
 jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.7
-
-      - name: Install
-        run: pip install -r <(curl https://raw.githubusercontent.com/lsst/linting/main/requirements.txt)
-
-      - name: Run linter
-        run: flake8
+  call-workflow:
+    uses: lsst/rubin_workflows/.github/workflows/lint.yaml@main

project_templates/stack_package/example_subpackage/pyproject.toml

@@ -0,0 +1,3 @@
+# Pytest configuration required to prevent pytest from looking for
+# configurations in parent directories. Can be empty.
+[tool.pytest.ini_options]

project_templates/stack_package/example_subpackage/setup.cfg

@@ -8,7 +8,3 @@ exclude =
   **/*/__init__.py,
   **/*/version.py,
   tests/.tests
-
-[tool:pytest]
-addopts = --flake8
-flake8-ignore = E133 E226 E228 N802 N803 N806 N812 N813 N815 N816 W503

project_templates/stack_package/{{cookiecutter.package_name}}/.github/workflows/lint.yaml

@@ -1,22 +1,11 @@
 name: lint
 
 on:
-  - push
-  - pull_request
+  push:
+    branches:
+      - main
+  pull_request:
 
 jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.7
-
-      - name: Install
-        run: pip install -r <(curl https://raw.githubusercontent.com/lsst/linting/main/requirements.txt)
-
-      - name: Run linter
-        run: flake8
+  call-workflow:
+    uses: lsst/rubin_workflows/.github/workflows/lint.yaml@main

project_templates/stack_package/{{cookiecutter.package_name}}/pyproject.toml

@@ -0,0 +1,3 @@
+# Pytest configuration required to prevent pytest from looking for
+# configurations in parent directories. Can be empty.
+[tool.pytest.ini_options]

project_templates/stack_package/{{cookiecutter.package_name}}/setup.cfg

@@ -8,7 +8,3 @@ exclude =
   **/*/__init__.py,
   **/*/version.py,
   tests/.tests
-
-[tool:pytest]
-addopts = --flake8
-flake8-ignore = E133 E226 E228 N802 N803 N806 N812 N813 N815 N816 W503

project_templates/technote_aastex/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change log
 
+## 2024-04-04
+
+Migrate to AASTeX 6.31.
+
 ## 2020-06-05
 
 Switch to GitHub Actions for continuous integration and deployment, replacing Travis CI.

project_templates/technote_aastex/cookiecutter.json

@@ -39,8 +39,8 @@
   "_copy_without_render": [
     "*.bib",
     "*acron*",
-    "aastex62.cls",
-    "yahapj.bst",
+    "aastex631.cls",
+    "aasjournal.bst",
     ".gitignore",
     "body.tex"
   ],

project_templates/technote_aastex/testn-000/.github/workflows/ci.yaml

@@ -7,13 +7,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # full history for metadata
           submodules: true
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"