Skip to content

Commit e716708

Browse files
authored
Merge branch 'master' into toph-system-caches-runtime
2 parents 2efd90a + daba77f commit e716708

File tree

5 files changed

+11
-3
lines changed

5 files changed

+11
-3
lines changed

.github/workflows/main.yml

+6
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
permissions:
1111
id-token: write
1212
contents: write
13+
pull-requests: write
1314
jobs:
1415
test:
1516
strategy:
@@ -34,6 +35,11 @@ jobs:
3435
- run: make lint
3536
- run: python setup.py --version
3637
- run: make test-${{ matrix.python-version }}
38+
- if: github.event_name == 'pull_request' && matrix.python-version == '3.8'
39+
uses: orgoro/coverage@v3
40+
with:
41+
coverageFile: coverage.xml
42+
token: ${{ secrets.GITHUB_TOKEN }}
3743
prerelease-test:
3844
runs-on: ubuntu-latest
3945
continue-on-error: true

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
htmlcov
2626
test-home/
2727
venv
28+
coverage.xml
2829

2930
# Temporary dev files
3031
vetiver-testing/rsconnect_api_keys.json

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7-
## Unreleased
7+
## [1.16.0] - 2023-03-27
88

99
### Added
1010
- The `CONNECT_REQUEST_TIMEOUT` environment variable, which configures the request timeout for all blocking HTTP and HTTPS operations. This value translates into seconds (e.g., `CONNECT_REQUEST_TIMEOUT=60` is equivalent to 60 seconds.) By default, this value is 300.

integration-testing/cypress.config.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ module.exports = defineConfig({
1818
defaultCommandTimeout: 10000,
1919
specPattern: "cypress/e2e/**/*.cy.js",
2020
},
21-
})
21+
"retries": 2
22+
})

scripts/runtests

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ set -o errexit
33
set -o pipefail
44
set -o xtrace
55

6-
: "${PYTEST_ARGS:=-vv --cov=rsconnect --cov-report=term --cov-report=html}"
6+
: "${PYTEST_ARGS:=-vv --cov=rsconnect --cov-report=term --cov-report=html --cov-report=xml}"
77
pytest ${PYTEST_ARGS} --mypy ./tests/

0 commit comments

Comments
 (0)