Skip to content

Commit

Permalink
Merge branch 'main' into update-contributors
Browse files Browse the repository at this point in the history
  • Loading branch information
cbkerr authored Feb 12, 2024
2 parents 9bbde6e + c28bfb9 commit 96b6c45
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 14 deletions.
18 changes: 16 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,21 @@ updates:
- package-ecosystem: pip
directory: "/"
schedule:
interval: monthly
open-pull-requests-limit: 10
interval: "weekly"
time: "07:00"
timezone: "EST5EDT"
open-pull-requests-limit: 2
reviewers:
- glotzerlab/signac-maintainers
- package-ecosystem: "github-actions"
directory: "/"
target-branch: main
schedule:
interval: "weekly"
time: "07:00"
timezone: "EST5EDT"
pull-request-branch-name:
separator: "-"
reviewers:
- glotzerlab/signac-maintainers
open-pull-requests-limit: 2
8 changes: 4 additions & 4 deletions .github/workflows/publish-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out repo
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.11"
- name: Install dependencies
Expand All @@ -44,7 +44,7 @@ jobs:
run:
python -m pytest -v tests/
- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: release
path: dist/
Expand All @@ -54,7 +54,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Download artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: release
path: dist/
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/run-pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,16 @@ jobs:
os: 'ubuntu-latest'
python: '3.12'
dependencies: 'minimal'
- os: 'macos-latest'
- os: 'macos-14'
python: '3.12'
dependencies: 'minimal'
- os: 'windows-latest'
python: '3.12'
dependencies: 'minimal'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}
- name: Install newest dependencies
Expand All @@ -87,6 +87,6 @@ jobs:
- name: Test with pytest
run: |
pytest --cov=signac --cov-config=pyproject.toml --cov-report=xml tests/ -v
- uses: codecov/codecov-action@v3
- uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ This makes it easier to operate on large data spaces, streamlines post-processin
Examples, tutorials, topic guides, and package Python APIs.
- [Package documentation](https://docs.signac.io/projects/core/):
API reference for the **signac** package.
- [Slack Chat Support](https://signac.io/slack-invite/):
Get help and ask questions on the **signac** Slack workspace.
- [Discussion board](https://github.com/glotzerlab/signac/discussions/):
Ask the **signac** user community for help.
- [Slack workspace](https://signac.io/slack-invite/):
Chat about **signac**.
- [**signac** website](https://signac.io/):
Framework overview and news.

Expand Down
5 changes: 5 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ Fixed

- Fixed parsing of ``$not`` query expressions on command line (#970).

Removed
+++++++

- Unused ``ruamel.yaml`` dependency (#981).

[2.1.0] -- 2023-07-12
---------------------

Expand Down
3 changes: 1 addition & 2 deletions requirements/requirements-test-optional.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
h5py==3.10.0; implementation_name=='cpython'
numpy==1.26.3
numpy==1.26.4
pandas==2.2.0; implementation_name=='cpython'
ruamel.yaml==0.18.5
tables==3.9.2; implementation_name=='cpython'

0 comments on commit 96b6c45

Please sign in to comment.