Skip to content

Commit

Permalink
Merge branch 'master' into api-key-in-server-check
Browse files Browse the repository at this point in the history
  • Loading branch information
mmarchetti authored Oct 17, 2023
2 parents dc8094f + 21acd6b commit 62b41b4
Showing 3 changed files with 3 additions and 8 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -12,6 +12,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
Authorization header containing the API key. This is needed
for Connect installations behind a proxy that only passes
authenticated requests.
- Common environment directories (`env, venv, .env, .venv`) are no longer
excluded by name. Environments are detected by the presence of a python
executable in `bin` or `Scripts` and excluded.

### Added
- Added support for the `no_proxy` or `NO_PROXY` environment variables to specify
4 changes: 0 additions & 4 deletions rsconnect/bundle.py
Original file line number Diff line number Diff line change
@@ -39,17 +39,13 @@
# noinspection SpellCheckingInspection
directories_ignore_list = [
".Rproj.user/",
".env/",
".git/",
".svn/",
".venv/",
"__pycache__/",
"env/",
"packrat/",
"renv/",
"rsconnect-python/",
"rsconnect/",
"venv/",
]
directories_to_ignore = {Path(d) for d in directories_ignore_list}

4 changes: 0 additions & 4 deletions tests/test_bundle.py
Original file line number Diff line number Diff line change
@@ -537,10 +537,6 @@ def test_keep_manifest_specified_file(self):
self.assertFalse(keep_manifest_specified_file("rsconnect-python"))
self.assertFalse(keep_manifest_specified_file("rsconnect-python/bogus.file"))
self.assertFalse(keep_manifest_specified_file(".svn/bogus.file"))
self.assertFalse(keep_manifest_specified_file(".env/share/jupyter/kernels/python3/kernel.json"))
self.assertFalse(keep_manifest_specified_file(".venv/bin/activate"))
self.assertFalse(keep_manifest_specified_file("env/pyvenv.cfg"))
self.assertFalse(keep_manifest_specified_file("venv/lib/python3.8/site-packages/wheel/__init__.py"))
# noinspection SpellCheckingInspection
self.assertFalse(keep_manifest_specified_file(".Rproj.user/bogus.file"))

0 comments on commit 62b41b4

Please sign in to comment.