Skip to content
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

Jump to bottom

Expand .gitgnore for venv #4800

Merged
merged 1 commit into from
Sep 13, 2019
Merged

Expand .gitgnore for venv #4800

merged 1 commit into from
Sep 13, 2019

Conversation

emkll
Copy link
Contributor

@emkll emkll commented Sep 11, 2019

Status

Ready for review

Description of Changes

Fixes #4796

Testing

In Tails:

  • securedrop-admin setup
  • git status does not track the .venv folder
  • .venv3/ will be the virtualenv folder once securedrop-admin is moved to python3

Deployment

Updates will be provided to new and existing SecureDrop admin workstations using git via the securedrop updater GUI or manual git fetch

@emkll
Expand .gitgnore for venv
2eb257d 
The wilcard did not match `.venv/` folder used for python2 virtualenv in the securedrop-admin context
@emkll emkll added this to the 1.0.0 milestone Sep 11, 2019
@emkll emkll requested review from kushaldas and rmol September 11, 2019 21:32
@conorsch conorsch mentioned this pull request Sep 12, 2019
Closed
1 task
@conorsch conorsch self-requested a review September 12, 2019 19:10
conorsch
conorsch approved these changes Sep 12, 2019
View reviewed changes
Copy link
Contributor

@conorsch conorsch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Although I was unable to reproduce the issue described in #4796, the changes here work well, and are a bit more explicit (and therefore more maintainable) than the glob previously. Happy to see this go in.

kushaldas
kushaldas approved these changes Sep 13, 2019
View reviewed changes
Copy link
Contributor

@kushaldas kushaldas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also could not reproduce this, but, as @conorsch mentioned, I am approving this one.

@kushaldas kushaldas merged commit 291e4f7 into develop Sep 13, 2019
@kushaldas kushaldas mentioned this pull request Sep 13, 2019
Merged
@emkll emkll deleted the 4796-fix-gitignore branch October 8, 2019 13:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@conorsch conorsch conorsch approved these changes

@kushaldas kushaldas kushaldas approved these changes

@rmol rmol Awaiting requested review from rmol

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.0.0
Development

Successfully merging this pull request may close these issues.

securedrop-admin .venv not git ignored in 1.0.0
3 participants
@emkll @kushaldas @conorsch