diff --git a/.circleci/config.yml b/.circleci/config.yml index 0899bfd6..7f084e43 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,10 +14,6 @@ jobs: command: | conda config --set always_yes yes --set changeps1 no conda install requests termcolor - - run: - name: Validate affiliated package JSON repository - command: | - python affiliated/validate_registry.py - run: name: Validate roles JSON file command: | @@ -25,8 +21,3 @@ jobs: - store_artifacts: path: /root/project destination: html - - -notify: - webhooks: - - url: https://giles.cadair.dev/circleci diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..6b0c2359 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,15 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates + +version: 2 +updates: + - package-ecosystem: "github-actions" # See documentation for possible values + directory: ".github/workflows" # Location of package manifests + schedule: + interval: "weekly" + groups: + actions: + patterns: + - "*" diff --git a/.github/workflows/circle_artifacts.yml b/.github/workflows/circle_artifacts.yml new file mode 100644 index 00000000..26227dfd --- /dev/null +++ b/.github/workflows/circle_artifacts.yml @@ -0,0 +1,15 @@ +on: [status] +jobs: + circleci_artifacts_redirector_job: + if: "${{ startsWith(github.event.context, 'ci/circleci: build') }}" + runs-on: ubuntu-latest + name: Run CircleCI artifacts redirector + steps: + - name: GitHub Action step + uses: scientific-python/circleci-artifacts-redirector-action@5d358ff96e96429a5c64a969bb4a574555439f4f # v1.3.1 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + api-token: ${{ secrets.CIRCLECI_TOKEN }} + artifact-path: 0/html/index.html + circleci-jobs: build + job-title: Check the rendered docs here! diff --git a/.readthedocs.yaml b/.readthedocs.yaml new file mode 100644 index 00000000..9461c7d1 --- /dev/null +++ b/.readthedocs.yaml @@ -0,0 +1,17 @@ +# Read the Docs configuration file +# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details + +version: 2 + +build: + os: ubuntu-24.04 + apt_packages: + - rsync + tools: + python: "3.13" + jobs: + build: + html: + - echo $READTHEDOCS_OUTPUT + - mkdir --parents $READTHEDOCS_OUTPUT/html/ + - rsync -avz --exclude .git --exclude ".*" --exclude _readthedocs --exclude "*.py" --exclude CNAME ./ _readthedocs/html diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 040a0862..cb1731e4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,8 +2,11 @@ For general information on the contribution process, see the [Astropy core packa # Affiliated Packages -To propose inclusion of a package as an affiliated package (or propose a change in your package's status), you must make a PR modifying the `/affiliated/registry.json` file in this repository. The details of the review process are outlined at http://affiliated.astropy.org. +To propose inclusion of a package as an affiliated package, we work with pyOpenSci to support +the review process, which when complete will lead to your package being listed here. +The details of the review process are outlined at http://affiliated.astropy.org. # Modifying Roles in the Team section + * Modify the `roles.json` file * Preview locally by opening `team.html` in your browser. Note that most browsers restrict local file access (needed to access your local copy of `roles.json`), so you'll need to configure your browser to allow this - details depend on the browser, but usually you find it in some sort of "developer" menu. diff --git a/README.md b/README.md index f04b7fd7..939b2611 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,6 @@ -This repository contains the Astropy web site (primary URL http://www.astropy.org). +[![docs](https://app.readthedocs.org/projects/astropy-org/badge/?version=latest)](https://astropy-org.readthedocs.io/en/latest/) -In a previous version of this web site (on the [old_site branch](https://github.com/astropy/astropy.github.com/tree/old_site)), this repository held the build for the site, but the content was generated from the [astropy-website repository](https://github.com/astropy/astropy-website). That repo is no longer active, and issues with the astropy web site should now be reported in *this* repository. +This repository contains the Astropy web site (primary URL https://astropy.org). - -## If you locally cloned this repo before 12 Apr 2021 - -The primary branch for this repo has been transitioned from ``master`` to ``main``. If you have a local clone of this repository and want to keep your local branch in sync with this repo, you'll need to do the following in your local clone from your terminal: -``` -git fetch --all --prune -# you can stop here if you don't use your local "master"/"main" branch -git branch -m master main -git branch -u origin/main main -``` -If you are using a GUI to manage your repos you'll have to find the equivalent commands as it's different for different programs. Alternatively, you can just delete your local clone and re-clone! \ No newline at end of file +> [!NOTE] +> In a previous version of this web site (on the [old_site branch](https://github.com/astropy/astropy.org/tree/old_site)), this repository held the build for the site, but the content was generated from the [astropy-website repository](https://github.com/astropy/astropy-website). That repo is no longer active, and issues with the Astropy web site should now be reported in *this* repository. diff --git a/about.html b/about.html old mode 100755 new mode 100644 index e68c38f1..925ca005 --- a/about.html +++ b/about.html @@ -40,6 +40,7 @@
  • About Astropy
  • Code of Conduct
  • Acknowledging & Citing
  • +
  • History
  • @@ -48,23 +49,23 @@
  • Contribute
  • Affiliated Packages
  • Team
  • +
  • Credits