Skip to content

Commit

Permalink
Merge pull request #245 from thegridelectric/dev
Browse files Browse the repository at this point in the history
v 0.6.4: Updated code derivation tools
  • Loading branch information
jessicamillar committed Jan 17, 2024
2 parents f3efdd3 + d9f2008 commit e94ee58
Show file tree
Hide file tree
Showing 258 changed files with 42,258 additions and 37,326 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/constraints.txt
@@ -1,5 +1,5 @@
pip==23.3.1
pip==23.3.2
nox==2023.4.22
nox-poetry==1.0.3
poetry==1.7.0
virtualenv==20.24.2
poetry==1.7.1
virtualenv==20.25.0
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Expand Up @@ -17,7 +17,7 @@ jobs:
fetch-depth: 2

- name: Set up Python
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: "3.10"

Expand Down Expand Up @@ -57,14 +57,14 @@ jobs:
- name: Publish package on PyPI
if: steps.check-version.outputs.tag
uses: pypa/gh-action-pypi-publish@v1.8.10
uses: pypa/gh-action-pypi-publish@v1.8.11
with:
user: __token__
password: ${{ secrets.PYPI_TOKEN }}

- name: Publish package on TestPyPI
if: "! steps.check-version.outputs.tag"
uses: pypa/gh-action-pypi-publish@v1.8.10
uses: pypa/gh-action-pypi-publish@v1.8.11
with:
user: __token__
password: ${{ secrets.TEST_PYPI_TOKEN }}
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/tests.yml
Expand Up @@ -12,16 +12,16 @@ jobs:
fail-fast: false
matrix:
include:
- { python: "3.10", os: "ubuntu-latest", session: "pre-commit" }
- { python: "3.11", os: "ubuntu-latest", session: "pre-commit" }
# - { python: "3.10", os: "ubuntu-latest", session: "safety" }
# - { python: "3.10", os: "ubuntu-latest", session: "mypy" }
- { python: "3.11", os: "ubuntu-latest", session: "tests" }
- { python: "3.10", os: "ubuntu-latest", session: "tests" }
- { python: "3.10", os: "windows-latest", session: "tests" }
- { python: "3.10", os: "macos-latest", session: "tests" }
- { python: "3.11", os: "windows-latest", session: "tests" }
- { python: "3.11", os: "macos-latest", session: "tests" }
# - { python: "3.10", os: "ubuntu-latest", session: "typeguard" }
- { python: "3.10", os: "ubuntu-latest", session: "xdoctest" }
- { python: "3.10", os: "ubuntu-latest", session: "docs-build" }
- { python: "3.11", os: "ubuntu-latest", session: "xdoctest" }
- { python: "3.11", os: "ubuntu-latest", session: "docs-build" }

env:
NOXSESSION: ${{ matrix.session }}
Expand All @@ -33,7 +33,7 @@ jobs:
uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python }}
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}

Expand Down Expand Up @@ -112,9 +112,9 @@ jobs:
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.11"

- name: Upgrade pip
run: |
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -13,7 +13,7 @@ hacking
.idea
scratch.*
cook.sh

.vscode

# Code generation airtable
CodeGenerationTools/GridworksCore/SassyMQ/
Expand Down
12 changes: 6 additions & 6 deletions .pre-commit-config.yaml
Expand Up @@ -22,12 +22,12 @@ repos:
entry: check-yaml
language: system
types: [yaml]
- id: darglint
name: darglint
entry: darglint
language: system
types: [python]
stages: [manual]
# - id: darglint
# name: darglint
# entry: darglint
# language: system
# types: [python]
# stages: [manual]
- id: end-of-file-fixer
name: Fix End of Files
entry: end-of-file-fixer
Expand Down

0 comments on commit e94ee58

Please sign in to comment.