Skip to content

Feature 40 v115 #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Sep 8, 2024
Merged

Feature 40 v115 #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dc37967
[TESTS] Initial hardening with pinned dependencies (- WIP #40 -)
reactive-firewall Sep 7, 2024
507029d
[REGRESSION] Revert test-requirement of pytest-cov back down to v4+ t…
reactive-firewall Sep 7, 2024
2c020f6
[REGRESSION] revert pytyest-enabler back to v1.0.1 in CI to continue …
reactive-firewall Sep 7, 2024
715705c
[TESTS] Testing prototype tool to fetch and verify the cc-test-report…
reactive-firewall Sep 7, 2024
86f5dcd
[REGRESSION] chmod 755 new tool :hear_no_evil: (- WIP #40 -)
reactive-firewall Sep 7, 2024
a53dd67
[STYLE] numerous style fixes to satisfy shellcheck and improve consis…
reactive-firewall Sep 8, 2024
e07e301
[REGRESSION] fix syntax by reverting (- WIP #74 -)
reactive-firewall Sep 8, 2024
590cbdf
[REGRESSION] fix syntax by reverting - OPS MISSED ON (- WIP #74 -)
reactive-firewall Sep 8, 2024
4cdc900
[REGRESSION] fix syntax by reverting - back to a working CI (- WIP #7…
reactive-firewall Sep 8, 2024
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
27 changes: 5 additions & 22 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,9 @@ jobs:
when: on_success
- run:
shell: /bin/bash
name: "install coverage attempt"
name: "install test extras attempt"
command: |
python3 -m pip install --user coverage || true
- run:
name: "install flake8 attempt"
command: |
python3 -m pip install --user flake8 || true
when: on_success
python3 -m pip install --user -r ./test-requirements.txt || true
- save_cache:
key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
paths:
Expand All @@ -61,12 +56,6 @@ jobs:
steps:
- restore_cache:
key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
- run:
shell: /bin/bash
name: "clean up for test"
command: |
python3 -m pip install --user coverage || true
when: on_success
- run:
shell: /bin/bash
name: "clean up for test"
Expand Down Expand Up @@ -111,17 +100,11 @@ jobs:
steps:
- restore_cache:
key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
- run:
shell: /bin/bash
name: "clean up for test"
command: |
python3 -m pip install --user coverage || true
when: on_success
- run:
shell: /bin/bash
name: "setup up for pytest"
command: |
python3 -m pip install --user pytest || true
python3 -m pip install --upgrade --user -r ./test-requirements.txt || true
when: on_success
- run:
shell: /bin/bash
Expand Down Expand Up @@ -168,9 +151,9 @@ jobs:
- restore_cache:
key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
- run:
name: "install flake8 attempt"
name: "install linters extras attempt"
command: |
python3 -m pip install --user flake8 || true
python3 -m pip install --upgrade --user -r ./test-requirements.txt || true
- run:
shell: /bin/bash
name: "clean up for test"
Expand Down
78 changes: 28 additions & 50 deletions .github/workflows/Tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,9 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Setup dependencies
run: |
python -m pip install --upgrade pip setuptools wheel
python -m pip install --upgrade "pip>=21.0" "setuptools>=45.0" "wheel>=0.37"
pip install -r ./requirements.txt
pip install -r ./test-requirements.txt || true
- name: Pre-build
id: bootstrap
run: |
Expand Down Expand Up @@ -151,8 +152,8 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Install dependencies for ${{ matrix.python-version }}
run: |
pip install -r ./requirements.txt ;
pip install coverage || true ;
pip install -r ./requirements.txt
pip install -r ./test-requirements.txt || true
- name: Pre-Clean
id: clean
run: make -j1 -f Makefile clean || true ;
Expand Down Expand Up @@ -198,23 +199,18 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Install dependencies for python ${{ matrix.python-version }} on ${{ matrix.os }}
run: |
pip install --upgrade --upgrade-strategy eager pip setuptools wheel ;
pip install --upgrade --upgrade-strategy eager -r ./requirements.txt ;
pip install --upgrade --upgrade-strategy eager pytest ;
pip install --upgrade --upgrade-strategy eager pytest-cov ;
pip install --upgrade --upgrade-strategy eager coverage ;
pip install --upgrade "pip>=21.0" "setuptools>=45.0" "wheel>=0.37"
pip install -r ./requirements.txt
pip install -r ./test-requirements.txt || true
- name: Install code-climate tools for ${{ matrix.python-version }}
if: ${{ runner.os }} == "Linux"
if: ${{ runner.os }} != "Linux"
shell: bash
run: |
if [ $OS == ubuntu-latest ] ; then curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter || true ; fi ;
if [ $OS == ubuntu-latest ] ; then chmod +x ./cc-test-reporter 2>/dev/null || true ; fi
if [ $OS == ubuntu-latest ] ; then ./cc-test-reporter before-build || true ; fi
run: if [ "$OS" == "macos-latest" ] ; then ./tests/fetch_cc-test-reporter || true ; fi ;
- name: Install deepsource tools for ${{ matrix.python-version }}
if: ${{ runner.os }} == "Linux"
shell: bash
run: |
if [ $OS == ubuntu-latest ] ; then (curl https://deepsource.io/cli | sh) || true ; else echo "SKIP deepsource" ; fi ;
if [ "$OS" == "ubuntu-latest" ] ; then (curl https://deepsource.io/cli | sh) || true ; else echo "SKIP deepsource" ; fi ;
- name: Pre-Clean
id: clean
run: make -j1 -f Makefile clean || true ;
Expand All @@ -241,15 +237,15 @@ jobs:
path: ./test-reports/
if-no-files-found: ignore
- name: code-climate for ${{ matrix.python-version }}
if: ${{ runner.os }} == "Linux"
if: ${{ runner.os }} != "Linux"
shell: bash
run: |
if [ $OS == ubuntu-latest ] ; then ./cc-test-reporter after-build --exit-code 0 || true ; else echo "SKIP code climate" ; fi ;
if [ "$OS" == "macos-latest" ] ; then ./cc-test-reporter after-build --exit-code 0 || true ; else echo "SKIP code climate" ; fi ;
- name: deepsource for ${{ matrix.python-version }}
if: ${{ runner.os }} == "Linux"
shell: bash
run: |
if [ $OS == ubuntu-latest ] ; then ./bin/deepsource report --analyzer test-coverage --key python --value-file ./coverage.xml 2>/dev/null || true ; else echo "SKIP deepsource" ; fi ;
if [ "$OS" == "ubuntu-latest" ] ; then ./bin/deepsource report --analyzer test-coverage --key python --value-file ./coverage.xml 2>/dev/null || true ; else echo "SKIP deepsource" ; fi ;
- name: Post-Clean
id: post
run: make -j1 -f Makefile clean || true ;
Expand Down Expand Up @@ -282,23 +278,18 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Install dependencies for python ${{ matrix.python-version }} on ${{ matrix.os }}
run: |
pip install --upgrade --upgrade-strategy eager pip setuptools wheel ;
pip install --upgrade --upgrade-strategy eager -r ./requirements.txt ;
pip install --upgrade --upgrade-strategy eager pytest ;
pip install --upgrade --upgrade-strategy eager pytest-cov ;
pip install --upgrade --upgrade-strategy eager coverage ;
pip install --upgrade "pip>=21.0" "setuptools>=45.0" "wheel>=0.37" ;
pip install -r ./requirements.txt ;
pip install -r ./test-requirements.txt || true ;
- name: Install code-climate tools for ${{ matrix.python-version }}
if: ${{ runner.os }} == "Linux"
shell: bash
run: |
if [ $OS == ubuntu-latest ] ; then curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter || true ; fi ;
if [ $OS == ubuntu-latest ] ; then chmod +x ./cc-test-reporter 2>/dev/null || true ; fi
if [ $OS == ubuntu-latest ] ; then ./cc-test-reporter before-build || true ; fi
run: if [ "$OS" == "ubuntu-latest" ] ; then ./tests/fetch_cc-test-reporter || true ; fi ;
- name: Install deepsource tools for ${{ matrix.python-version }}
if: ${{ runner.os }} == "Linux"
shell: bash
run: |
if [ $OS == ubuntu-latest ] ; then (curl https://deepsource.io/cli | sh) || true ; else echo "SKIP deepsource" ; fi ;
if [ "$OS" == "ubuntu-latest" ] ; then (curl https://deepsource.io/cli | sh) || true ; else echo "SKIP deepsource" ; fi ;
- name: Pre-Clean
id: clean
run: make -j1 -f Makefile clean || true ;
Expand Down Expand Up @@ -328,12 +319,12 @@ jobs:
if: ${{ runner.os }} == "Linux"
shell: bash
run: |
if [ $OS == ubuntu-latest ] ; then ./cc-test-reporter after-build --exit-code 0 || true ; else echo "SKIP code climate" ; fi ;
if [ "$OS" == "ubuntu-latest" ] ; then ./cc-test-reporter after-build --exit-code 0 || true ; else echo "SKIP code climate" ; fi ;
- name: deepsource for ${{ matrix.python-version }}
if: ${{ runner.os }} == "Linux"
shell: bash
run: |
if [ $OS == ubuntu-latest ] ; then ./bin/deepsource report --analyzer test-coverage --key python --value-file ./coverage.xml 2>/dev/null || true ; else echo "SKIP deepsource" ; fi ;
if [ "$OS" == "ubuntu-latest" ] ; then ./bin/deepsource report --analyzer test-coverage --key python --value-file ./coverage.xml 2>/dev/null || true ; else echo "SKIP deepsource" ; fi ;
- name: Post-Clean
id: post
run: make -j1 -f Makefile clean || true ;
Expand All @@ -357,11 +348,9 @@ jobs:
python-version: "3.10"
- name: Install dependencies for python Linters
run: |
pip install --upgrade pip setuptools wheel
pip install --upgrade "pip>=21.0" "setuptools>=45.0" "wheel>=0.37" ;
pip install -r ./requirements.txt ;
pip install flake8 ;
pip install pyflakes ;
pip install pep8 ;
pip install -r ./test-requirements.txt || true ;
- name: Pre-Clean
id: clean
run: make -j1 -f Makefile clean || true ;
Expand Down Expand Up @@ -403,17 +392,12 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Install dependencies for python ${{ matrix.python-version }} on ${{ matrix.os }}
run: |
pip install --upgrade pip setuptools wheel
pip install --upgrade "pip>=21.0" "setuptools>=45.0" "wheel>=0.37" ;
pip install -r ./requirements.txt ;
pip install coverage ;
pip install pytest ;
pip install pytest-cov ;
pip install -r ./test-requirements.txt || true ;
- name: Install code-climate tools for ${{ matrix.python-version }}
if: ${{ runner.os }} != "Linux"
run: |
if [ $OS == macos-latest ] ; then curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-darwin-amd64 > ./cc-test-reporter || true ; fi ;
if [ $OS == macos-latest ] ; then chmod +x ./cc-test-reporter 2>/dev/null || true ; fi
if [ $OS == macos-latest ] ; then ./cc-test-reporter before-build || true ; fi
run: if [ $OS == macos-latest ] ; then ./tests/fetch_cc-test-reporter || true ; fi ;
shell: bash
- name: Pre-Clean
id: clean-prep
Expand Down Expand Up @@ -448,7 +432,7 @@ jobs:
- name: code-climate for ${{ matrix.python-version }}
if: ${{ runner.os }} != "Linux"
run: |
if [ $OS == macos-latest ] ; then ./cc-test-reporter after-build --exit-code 0 || true ; else echo "SKIP code climate" ; fi ;
if [ "$OS" == "macos-latest" ] ; then ./cc-test-reporter after-build --exit-code 0 || true ; else echo "SKIP code climate" ; fi ;
- name: Post-purge
id: post-uninstall
run: make -j1 -f Makefile purge || true ;
Expand Down Expand Up @@ -477,15 +461,9 @@ jobs:
python-version: "3.10"
- name: Install dependencies for Tox
run: |
pip install --upgrade pip setuptools wheel tox
pip install --upgrade "pip>=21.0" "setuptools>=45.0" "wheel>=0.37" "tox>=3.0";
pip install -r ./requirements.txt ;
pip install coverage ;
pip install codecov ;
pip install flake8 ;
pip install pyflakes ;
pip install pep8 ;
pip install tox ;
pip install six ;
pip install -r ./test-requirements.txt || true ;
- name: Pre-Clean
id: clean
run: make -j1 -f Makefile clean || true ;
Expand Down
34 changes: 34 additions & 0 deletions test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#python
# time - builtin - PSF licence
# re - builtin - PSF licence?
# subprocess - PSF licence
# sphinx
# argparse - builtin - PSF licence
argparse>=1.4.0
# argparse - builtin - PSF licence
setuptools>=38.0
# virtualenv - MIT
virtualenv>=15.0.1
# six - MIT
six>=1.0.0
# pgpy - BSD 3-Clause licensed
#pgpy>=0.4.1
tox>=3.0.0
#py>=1.4.33
# pip>=19.0
###
# TESTING ONLY - Do NOT report issues with these optionals on python-repo
###
flake8>=5.0
pyflakes>=2.5.0
pep8>=1.0
pytest>=7
pytest-checkdocs>=2.4
pytest-cov>=4.0.0
pytest-enabler>=1.0.1
pytest-flake8>=1.0
coverage >= 6.3
pytest-cov >= 4.0.0;
pytest-enabler >= 1.0.1
wheel >= 0.37.0
pip >= 21.0
Loading
Loading