Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/pip-audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
python-version: ${{ matrix.python-version }}
cache: 'pip'
cache-dependency-path: |
requirements.txt
installation/requirements.txt
architecture: x64
- name: 'Install requirements (standard or constraints ${{ matrix.python-version }})'
run: |
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
python -mvenv /tmp/PIPFREEZE
source /tmp/PIPFREEZE/bin/activate
pip install --upgrade pip wheel
pip install -r requirements.txt
pip install -r installation/requirements.txt
pip freeze > constraints-${{ matrix.python-version }}.txt

# Re-audit the populated environment
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ jobs:
python-version: ${{ matrix.python-version }}
cache: 'pip'
cache-dependency-path: |
requirements.txt
mypy-requirements.txt
dev-requirements.txt
installation/requirements.txt
installation/mypy-requirements.txt
installation/dev-requirements.txt
architecture: x64
- name: 'Install requirements (standard or constraints ${{ matrix.python-version }})'
run: |
Expand All @@ -35,24 +35,24 @@ jobs:
regen_constraints=
if [ -f "$constraints_file" ] ; then
at="$(git --no-pager log -p -1 "--format=tformat:%at" --no-patch -- "$constraints_file")"
dat="$(git --no-pager log -p -1 "--format=tformat:%at" --no-patch -- "requirements.txt")"
dat="$(git --no-pager log -p -1 "--format=tformat:%at" --no-patch -- "installation/requirements.txt")"
if [ "$at" -lt "$dat" ] ; then
regen_constraints=true
fi
else
regen_constraints=true
fi
if [ -n "$regen_constraints" ] ; then
pip install -r requirements.txt
pip install -r installation/requirements.txt
pip freeze > "$constraints_file"
grep -vF git+ "$constraints_file" > "$constraints_file"-relaxed
else
grep -vF git+ "$constraints_file" > "$constraints_file"-relaxed
pip install -r requirements.txt -c "$constraints_file"-relaxed
pip install -r installation/requirements.txt -c "$constraints_file"-relaxed
fi
- name: 'Install development requirements'
run: |
pip install -r dev-requirements.txt -r mypy-requirements.txt -c constraints-${{ matrix.python-version }}.txt-relaxed
pip install -r installation/dev-requirements.txt -r installation/mypy-requirements.txt -c constraints-${{ matrix.python-version }}.txt-relaxed
- name: MyPy cache
uses: actions/cache@v5
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pre-commit_wsl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,20 +96,20 @@ jobs:
regen_constraints=
if [ -f "$constraints_file" ] ; then
at="$(git --no-pager log -p -1 "--format=tformat:%at" --no-patch -- "$constraints_file")"
dat="$(git --no-pager log -p -1 "--format=tformat:%at" --no-patch -- "requirements.txt")"
dat="$(git --no-pager log -p -1 "--format=tformat:%at" --no-patch -- "installation/requirements.txt")"
if [ "$at" -lt "$dat" ] ; then
regen_constraints=true
fi
else
regen_constraints=true
fi
if [ -n "$regen_constraints" ] ; then
pip install -r requirements.txt
pip install -r installation/requirements.txt
pip freeze > "$constraints_file"
grep -vF git+ "$constraints_file" > "$constraints_file"-relaxed
else
grep -vF git+ "$constraints_file" > "$constraints_file"-relaxed
pip install -r requirements.txt -c "$constraints_file"-relaxed
pip install -r installation/requirements.txt -c "$constraints_file"-relaxed
fi
- name: 'Install development requirements'
shell: wsl-bash {0}
Expand All @@ -118,7 +118,7 @@ jobs:
cd the_repo
source .env/bin/activate

pip install -r dev-requirements.txt -r mypy-requirements.txt -c constraints-${{ matrix.python-version }}_${{ matrix.distribution }}-wsl.txt-relaxed
pip install -r installation/dev-requirements.txt -r installation/mypy-requirements.txt -c constraints-${{ matrix.python-version }}_${{ matrix.distribution }}-wsl.txt-relaxed
# - name: MyPy cache
# uses: actions/cache@v5
# with:
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,8 @@ data/*
data_cmd/*
!data/.gitkeep
__pycache__
*.egg-info/
build/
dist/
__pycache__/
*.pyc
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
include LICENSE
include README.md
include requirements.txt
include installation/requirements.txt
Loading
Loading