Skip to content

Commit

Permalink
Merge pull request #1234 from GSA/fix/4532-synk-cryptography
Browse files Browse the repository at this point in the history
cryptography to 42.*.*, bump reqs
  • Loading branch information
jbrown-xentity committed Jan 29, 2024
2 parents 80bb065 + 2c304bb commit b265602
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ckan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
INSTANCE_NAME="$(echo ckan-auto-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT})"
echo "INSTANCE_NAME=${INSTANCE_NAME}" | tee -a $GITHUB_ENV
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: run task
uses: cloud-gov/cg-cli-tools@main
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ckan_auto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jobs:
environment: ${{matrix.environ}}
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set Unique Command Name
run: |
INSTANCE_NAME="$(echo ${{ matrix.command }}-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT} | tr -d ' ')"
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Lint GitHub Actions
run: yamllint -c .yamllint.yml .github/workflows/
test:
name: Build and Test
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: build
run: make build
- name: test
Expand All @@ -37,7 +37,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: test
run: make validate-proxy

Expand All @@ -46,9 +46,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: setup python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.9'
architecture: x64
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/egress_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
INSTANCE_NAME="$(echo egress-check-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT})"
echo "INSTANCE_NAME=${INSTANCE_NAME}" | tee -a $GITHUB_ENV
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: run task
uses: cloud-gov/cg-cli-tools@main
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
tag: ghcr.io/gsa/catalog.data.gov.db:latest
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: login to ghcr
uses: docker/login-action@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snyk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Set up Python 3.9
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.9
- name: Display Python version
Expand Down
2 changes: 1 addition & 1 deletion ckan/requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -123,5 +123,5 @@ requests==2.31.0
# avoid ImportError error https://github.com/GSA/data.gov/issues/4396
importlib-resources<6.0
gevent>=23.9.0
cryptography>=41.0.6
cryptography>=42
jinja2>=3.1.3
16 changes: 8 additions & 8 deletions ckan/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ Babel==2.10.3
Beaker==1.11.0
bleach==3.3.0
blinker==1.5
boto3==1.34.22
botocore==1.34.22
boto3==1.34.29
botocore==1.34.29
certifi==2023.11.17
cffi==1.16.0
chardet==5.2.0
Expand All @@ -26,7 +26,7 @@ ckanext-saml2auth @ git+https://github.com/GSA/ckanext-saml2auth.git@4d59366423e
-e git+https://github.com/ckan/ckanext-spatial.git@938308469892e4bcf7389cb4adee5ccdd5a0ccca#egg=ckanext_spatial
ckantoolkit==0.0.7
click==8.1.3
cryptography==41.0.7
cryptography==42.0.1
defusedxml==0.7.1
dominate==2.7.0
elementpath==4.1.5
Expand Down Expand Up @@ -59,11 +59,11 @@ jsonschema==2.4.0
lxml==5.1.0
Mako==1.3.0
Markdown==3.4.1
MarkupSafe==2.1.3
MarkupSafe==2.1.4
messytables==0.15.2
mypy==1.8.0
mypy-extensions==1.0.0
newrelic==9.5.0
newrelic==9.6.0
nose==1.3.7
numpy==1.26.3
oauth2client==4.1.3
Expand All @@ -83,15 +83,15 @@ pyasn1==0.5.1
pyasn1-modules==0.3.0
pycparser==2.21
PyJWT==2.4.0
pyOpenSSL==23.3.0
pyOpenSSL==24.0.0
pyparsing==3.1.1
pyproj==3.4.1
pysaml2==7.0.1
pysolr==3.9.0
python-dateutil==2.8.2
python-magic==0.4.27
python-utils==3.8.1
pytz==2023.3.post1
python-utils==3.8.2
pytz==2023.4
pytz-deprecation-shim==0.1.0.post0
PyUtilib==6.0.0
PyYAML==6.0
Expand Down

0 comments on commit b265602

Please sign in to comment.