Skip to content

Commit

Permalink
MNT: Drop support for Python 3.6 and 3.7.
Browse files Browse the repository at this point in the history
TST: Update test workflows.

TST: Use built-in cancel.
  • Loading branch information
pllim committed May 10, 2022
1 parent 638271c commit ff7ad8a
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 39 deletions.
17 changes: 0 additions & 17 deletions .github/workflows/cancel_workflows.yml

This file was deleted.

26 changes: 15 additions & 11 deletions .github/workflows/ci_workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ on:
# * is a special character in YAML so you have to quote this string
- cron: '0 6 * * 2'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

env:
jref: "https://ssb.stsci.edu/trds_open/jref"

Expand All @@ -17,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check base branch
uses: actions/github-script@v3
uses: actions/github-script@v6
if: github.event_name == 'pull_request'
with:
script: |
Expand All @@ -36,11 +40,11 @@ jobs:
needs: initial_checks
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: '3.x'
- name: Lint with flake8
Expand All @@ -63,14 +67,14 @@ jobs:
needs: initial_checks
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0
lfs: true
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: '3.7'
python-version: '3.8'
- name: Install and build
run: |
python -m pip install --upgrade pip setuptools wheel
Expand All @@ -84,14 +88,14 @@ jobs:
needs: initial_checks
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0
lfs: true
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: '3.8'
python-version: '3.10'
- name: Install and build
run: |
python -m pip install --upgrade pip setuptools wheel
Expand All @@ -106,9 +110,9 @@ jobs:
needs: initial_checks
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: '3.x'
- name: Install and build
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ on:
# The branches below must be a subset of the branches above
branches: [ master ]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
analyze:
name: Analyze
Expand All @@ -33,11 +37,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -48,7 +52,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -62,4 +66,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
8 changes: 6 additions & 2 deletions .github/workflows/open_actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ on:
types:
- opened

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
triage:
runs-on: ubuntu-latest
Expand All @@ -18,12 +22,12 @@ jobs:
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
- name: 'Comment Draft PR'
uses: actions/github-script@v3
uses: actions/github-script@v6
if: github.event.pull_request.draft == true
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
github.issues.createComment({
await github.rest.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
Expand Down
8 changes: 7 additions & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,20 @@
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
version: 2

build:
os: ubuntu-20.04
apt_packages:
- graphviz
tools:
python: "3.9"

sphinx:
builder: html
configuration: doc/source/conf.py
fail_on_warning: true

# Set the version of Python and requirements required to build your docs
python:
version: 3.8
install:
- method: pip
path: .
Expand Down
4 changes: 1 addition & 3 deletions doc/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ Different ways to install the latest release of this package::

conda install acstools -c conda-forge

conda install acstools -c http://ssb.stsci.edu/astroconda

To install the development version of this package::

pip install git+https://github.com/spacetelescope/acstools
Expand All @@ -32,7 +30,7 @@ To install the development version of this package::

.. note::

Python 2 is no longer supported. Please use Python 3.6 or later.
Python 2 is no longer supported. Please use Python 3.8 or later.

.. toctree::
:maxdepth: 2
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ install_requires =
beautifulsoup4
requests
PyYAML
python_requires = >=3.6
python_requires = >=3.8

[options.extras_require]
all =
Expand Down

0 comments on commit ff7ad8a

Please sign in to comment.