Skip to content

Remove environment directories from exclusion list #207

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 2 commits into from
Oct 16, 2023
Merged

Remove environment directories from exclusion list #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c56de4b
Don't exclude environment directories by name
mmarchetti Oct 16, 2023
749a839
udpate changelog
mmarchetti Oct 16, 2023
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
- The `https_proxy` environment variable is recognized as a synonym for
`HTTPS_PROXY`.
- 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
Expand Down
4 changes: 0 additions & 4 deletions rsconnect/bundle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
4 changes: 0 additions & 4 deletions tests/test_bundle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))

Expand Down