Skip to content

Commit 80a7596

Browse files
authored
Merge pull request #21 from inab/refactor/update_readme_conda
Refactor/update readme conda
2 parents dd2d6f8 + 28af7a6 commit 80a7596

31 files changed

Lines changed: 450 additions & 209 deletions

.github/workflows/pip-audit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
python-version: ${{ matrix.python-version }}
2020
cache: 'pip'
2121
cache-dependency-path: |
22-
requirements.txt
22+
installation/requirements.txt
2323
architecture: x64
2424
- name: 'Install requirements (standard or constraints ${{ matrix.python-version }})'
2525
run: |
@@ -48,7 +48,7 @@ jobs:
4848
python -mvenv /tmp/PIPFREEZE
4949
source /tmp/PIPFREEZE/bin/activate
5050
pip install --upgrade pip wheel
51-
pip install -r requirements.txt
51+
pip install -r installation/requirements.txt
5252
pip freeze > constraints-${{ matrix.python-version }}.txt
5353
5454
# Re-audit the populated environment

.github/workflows/pre-commit.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ jobs:
2424
python-version: ${{ matrix.python-version }}
2525
cache: 'pip'
2626
cache-dependency-path: |
27-
requirements.txt
28-
mypy-requirements.txt
29-
dev-requirements.txt
27+
installation/requirements.txt
28+
installation/mypy-requirements.txt
29+
installation/dev-requirements.txt
3030
architecture: x64
3131
- name: 'Install requirements (standard or constraints ${{ matrix.python-version }})'
3232
run: |
@@ -35,24 +35,24 @@ jobs:
3535
regen_constraints=
3636
if [ -f "$constraints_file" ] ; then
3737
at="$(git --no-pager log -p -1 "--format=tformat:%at" --no-patch -- "$constraints_file")"
38-
dat="$(git --no-pager log -p -1 "--format=tformat:%at" --no-patch -- "requirements.txt")"
38+
dat="$(git --no-pager log -p -1 "--format=tformat:%at" --no-patch -- "installation/requirements.txt")"
3939
if [ "$at" -lt "$dat" ] ; then
4040
regen_constraints=true
4141
fi
4242
else
4343
regen_constraints=true
4444
fi
4545
if [ -n "$regen_constraints" ] ; then
46-
pip install -r requirements.txt
46+
pip install -r installation/requirements.txt
4747
pip freeze > "$constraints_file"
4848
grep -vF git+ "$constraints_file" > "$constraints_file"-relaxed
4949
else
5050
grep -vF git+ "$constraints_file" > "$constraints_file"-relaxed
51-
pip install -r requirements.txt -c "$constraints_file"-relaxed
51+
pip install -r installation/requirements.txt -c "$constraints_file"-relaxed
5252
fi
5353
- name: 'Install development requirements'
5454
run: |
55-
pip install -r dev-requirements.txt -r mypy-requirements.txt -c constraints-${{ matrix.python-version }}.txt-relaxed
55+
pip install -r installation/dev-requirements.txt -r installation/mypy-requirements.txt -c constraints-${{ matrix.python-version }}.txt-relaxed
5656
- name: MyPy cache
5757
uses: actions/cache@v5
5858
with:

.github/workflows/pre-commit_wsl.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,20 +96,20 @@ jobs:
9696
regen_constraints=
9797
if [ -f "$constraints_file" ] ; then
9898
at="$(git --no-pager log -p -1 "--format=tformat:%at" --no-patch -- "$constraints_file")"
99-
dat="$(git --no-pager log -p -1 "--format=tformat:%at" --no-patch -- "requirements.txt")"
99+
dat="$(git --no-pager log -p -1 "--format=tformat:%at" --no-patch -- "installation/requirements.txt")"
100100
if [ "$at" -lt "$dat" ] ; then
101101
regen_constraints=true
102102
fi
103103
else
104104
regen_constraints=true
105105
fi
106106
if [ -n "$regen_constraints" ] ; then
107-
pip install -r requirements.txt
107+
pip install -r installation/requirements.txt
108108
pip freeze > "$constraints_file"
109109
grep -vF git+ "$constraints_file" > "$constraints_file"-relaxed
110110
else
111111
grep -vF git+ "$constraints_file" > "$constraints_file"-relaxed
112-
pip install -r requirements.txt -c "$constraints_file"-relaxed
112+
pip install -r installation/requirements.txt -c "$constraints_file"-relaxed
113113
fi
114114
- name: 'Install development requirements'
115115
shell: wsl-bash {0}
@@ -118,7 +118,7 @@ jobs:
118118
cd the_repo
119119
source .env/bin/activate
120120
121-
pip install -r dev-requirements.txt -r mypy-requirements.txt -c constraints-${{ matrix.python-version }}_${{ matrix.distribution }}-wsl.txt-relaxed
121+
pip install -r installation/dev-requirements.txt -r installation/mypy-requirements.txt -c constraints-${{ matrix.python-version }}_${{ matrix.distribution }}-wsl.txt-relaxed
122122
# - name: MyPy cache
123123
# uses: actions/cache@v5
124124
# with:

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,8 @@ data/*
22
data_cmd/*
33
!data/.gitkeep
44
__pycache__
5+
*.egg-info/
6+
build/
7+
dist/
8+
__pycache__/
9+
*.pyc

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
include LICENSE
22
include README.md
3-
include requirements.txt
3+
include installation/requirements.txt

0 commit comments

Comments
 (0)