Skip to content

Commit

Permalink
Japatel no snow fix decryption py parameters (#71)
Browse files Browse the repository at this point in the history
* Remove parameters.py.gpg

* Add new gpg file, removed enc file used in travis

* Add new gpg file, removed enc file used in travis

* Change path

* Python version and python connector version pin to 2.2.7

* Fix path

* Remove whitesource

* Remove whitesource and travis files

* Minimum allowed version 2.2.7

* Explicitly install python connector in workflow

* Change import

* try new import

* Different way to run pyttest

* Install wheel

* Revert import

* Tests passing locally

* Re-adding init.py

* Revert "Re-adding init.py"

This reverts commit 78dbfe9.
  • Loading branch information
sfc-gh-japatel authored Oct 20, 2022
1 parent b3fb61d commit 186ed88
Show file tree
Hide file tree
Showing 10 changed files with 7 additions and 258 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/End2EndTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest ]
python-version: [ '3.6.12', '3.7.9', '3.8.7' ]
python-version: [ '3.7.9', '3.8.7' ]
steps:
- name: Checkout Code
uses: actions/checkout@v2
Expand All @@ -35,9 +35,12 @@ jobs:
- name: Generate Pytest coverage report
run: |
pip install pytest
pip install wheel
pip install pytest-cov
pip install .
pytest --cov=./ --cov-report=xml --tb=native tests
pip install snowflake-connector-python
python -m pytest --cov=./ --cov-report=xml --tb=native tests/
# pytest --cov=./ --cov-report=xml --tb=native tests

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
Expand All @@ -47,7 +50,3 @@ jobs:
fail_ci_if_error: true
verbose: true

- name: Run WhiteSource script
run: ./scripts/run_whitesource_gh.sh
env:
WHITESOURCE_API_KEY: ${{ secrets.WHITESOURCE_API_KEY }}
2 changes: 1 addition & 1 deletion scripts/decrypt_secret.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
# --batch to prevent interactive command --yes to assume "yes" for questions

gpg --quiet --batch --yes --decrypt --passphrase="$DECRYPTION_PASSPHRASE" \
--output ./tests/parameters.py ./tests/parameters.py.gpg
--output ./tests/parameters.py ./scripts/parameters.py.gpg
Binary file added scripts/parameters.py.gpg
Binary file not shown.
119 changes: 0 additions & 119 deletions scripts/run_whitesource.sh

This file was deleted.

114 changes: 0 additions & 114 deletions scripts/run_whitesource_gh.sh

This file was deleted.

17 changes: 0 additions & 17 deletions scripts/travis_install.sh

This file was deleted.

2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from sys import version_info, exit
# Define our list of installation dependencies
DEPENDS = ["pyjwt<2.0.0",
"snowflake-connector-python",
"snowflake-connector-python>=2.2.7",
"furl",
"cryptography",
"requests<2.24.0"]
Expand Down
Empty file removed snowflake/__init__.py
Empty file.
Binary file removed tests/parameters.py.enc
Binary file not shown.
Binary file modified tests/parameters.py.gpg
Binary file not shown.

0 comments on commit 186ed88

Please sign in to comment.