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

Update master with dev-master. #37

Merged
merged 78 commits into from
Feb 24, 2019
Merged

Update master with dev-master. #37

merged 78 commits into from
Feb 24, 2019

Conversation

grabear
Copy link
Member

@grabear grabear commented Oct 19, 2018

  • Added LICENSE
  • Updated README
  • Added utils.py file
  • Updated symlink functionality
  • Utilized Cookiecutter for scripts in /bin
    • .Rprofile
    • .Renviron
    • activate
  • Fixed activate script

grabearummc and others added 30 commits June 30, 2018 13:14
@grabearummc
Fixed explicit directory and prompt in the activate script
6a64a40
@grabearummc
Added initial Windows cookie.
b3c4c71
@grabearummc
Added initial Poisix Cookie.
13c370b
@santina
Houes keeping
623044c 
- Correct typos
- Create a build script
- Create .gitignore for opening project in PyCharm
@santina
Remove hardcoded path
1145dcc
@santina
Change environment creation location
8d0785d 
- Remove requirement to provide R installed path
- Add parameter to allow creating environment with just name
- Minor refactoring.
@grabear
Rearranged windows scripts for cookiecutter.
5068f85
@grabear
Rearranged Linux scripts for cookiecutter.
d07dcea
@grabear
Added __init__.py file for accessing pkg_resources.
c7a95cd
@grabear
Commented out replace_variables for testing.
39bf4cb
@grabear
Added libraries for new update.
f4c3f3f
@santina
Account for permission issue in Linux
02abfeb 
- Default to create environment folders in user home dir
@grabear
Added extra context variables for cookiecutter templates.
6117f53
@santina
Remove need to move .Rprofile and .Renviron around
7549473
@grabear
Fixed cookiecutter variables.
5e83a74
@grabear
Updated pythons venv variables with cookiecutter template variables.
57d8dae
@grabear
Added cookiecutter dependency.
da5f12e
@grabear
Fixed misspelled variable.
0d54ccd
@grabear
Fixed misspelled variable.
d8047a9
@grabear
Fixed misspelled directory.
05a3d8f
@grabear
Updated windows and linux cookiecutter templates.
2793fe2
@grabear
Reconfigured core functions for better functionality with cookiecutter.
9240043
@grabear
Update for potential bug fix.
85aa62c
@grabear
Replaced bug with cc templating.
3f105d1
@grabear
Updated template directory bug.
d98a25a
@grabear
Merge pull request #24 from datasnakes/master
28e7348 
Update dev-master with master.
@santina
Add activate functionality
21bbd88 
- Do activate through renv command
- Change activate script name
@santina
Revert "Add activate functionality"
5c827b8 
- Reason: Python cannot modify parent environment
@santina
Fix environment path check
b1318ca
@santina
Add environment created message
4da46c9
santina
santina reviewed Oct 21, 2018
View reviewed changes
renv/cookies/nt/cookiecutter.json Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
santina
santina reviewed Oct 21, 2018
View reviewed changes
renv/core.py Outdated Show resolved Hide resolved
santina
santina reviewed Oct 21, 2018
View reviewed changes
renv/core.py Outdated Show resolved Hide resolved
santina
santina requested changes Oct 21, 2018
View reviewed changes
Copy link
Collaborator

@santina santina left a comment

Choose a reason for hiding this comment

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

Left some comments on

  • Resolving merge conflicts
  • Add newline at the ends of the files
  • Remove commented out codes.

Hackseq 2018 - renv automation moved this from New Pull Requests to Pending Pull Request Oct 21, 2018
santina
santina requested changes Oct 21, 2018
View reviewed changes
Copy link
Collaborator

@santina santina left a comment

Choose a reason for hiding this comment

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

There are a bunch of merge conflicts in multiple files that need to be addressed

santina
santina reviewed Oct 21, 2018
View reviewed changes
README.md Outdated Show resolved Hide resolved
santina
santina reviewed Oct 21, 2018
View reviewed changes
README.md Outdated Show resolved Hide resolved
santina
santina requested changes Oct 21, 2018
View reviewed changes
Copy link
Collaborator

@santina santina left a comment

Choose a reason for hiding this comment

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

  • Fix merge conflicts
  • Remove commented out code - we have git so we can always go back to see them again
  • Add newline at the ends of the files, as flagged by GitHub

@santina
Copy link
Collaborator

santina commented Oct 21, 2018

GitHub's review system is broken. I cannot do inline comment. But in general here are my first round feedback:

  • Fix merge conflicts
  • Remove commented out code - we have git so we can always go back to see them again
  • Add newline at the ends of the files, as flagged by GitHub

@santina
Copy link
Collaborator

santina commented Oct 22, 2018 via email

@grabear
Copy link
Member Author

grabear commented Feb 21, 2019

Closing this and creating another PR. Something is wrong with the old suggestions. I cant commit directly and it's a bit confusing.

@grabear grabear closed this Feb 21, 2019
Hackseq 2018 - renv automation moved this from Pending Pull Request to Done Feb 21, 2019
@grabear
Copy link
Member Author

grabear commented Feb 21, 2019

This is super weird. We must have made commits without properly fixing merge conflicts.

@grabear grabear reopened this Feb 21, 2019
Hackseq 2018 - renv automation moved this from Done to Re-Opened Feb 21, 2019
@grabear grabear requested a review from santina February 24, 2019 17:21
Hackseq 2018 - renv automation moved this from Re-Opened to Approved Pull Requests Feb 24, 2019
@santina santina merged commit d9dabc9 into master Feb 24, 2019
Hackseq 2018 - renv automation moved this from Approved Pull Requests to Done Feb 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@santina santina santina approved these changes

Assignees

@santina santina

@grabear grabear

Labels
Priority: Critical
Projects
Hackseq 2018 - renv
  
Done
Milestone
Standalone CL
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@grabear @santina @grabearummc