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

651 conda activate fix mk #682

Closed
wants to merge 178 commits into from
Closed

651 conda activate fix mk #682

wants to merge 178 commits into from

Conversation

martinkilbinger
Copy link
Contributor

Summary

Developers should provide a summary of the proposed changes here and include "closes #" if this addresses an open issue.

Reviewer Checklist

Reviewers should tick the following boxes before approving and merging the PR.

  • The PR targets the develop branch
  • The PR is assigned to the developer
  • The PR has appropriate labels
  • The PR is included in appropriate projects and/or milestones
  • The PR includes a clear description of the proposed changes
  • If the PR addresses an open issue the description includes "closes #"
  • The code and documentation style match the current standards
  • Documentation has been added/updated consistently with the code
  • All CI tests are passing
  • API docs have been built and checked at least once (if relevant)
  • All changed files have been checked and comments provided to the developer
  • All of the reviewer's comments have been satisfactorily addressed by the developer

sfarrens and others added 30 commits November 16, 2022 09:36
@sfarrens
added Dockerfile and GH action
6934d27
@sfarrens
added make dependency
82bc72a
@martinkilbinger
notebook
5b44743
@martinkilbinger
docker testing
29c609e
@martinkilbinger
Merge remote-tracking branch 'upstream/develop' into docker_image
da18970
@martinkilbinger
Dockerfile tests
5770367
@martinkilbinger
Added cent-os to CI tests
3166e3c
@sfarrens
fixed bug in install_shapepipe
04a5315
@sfarrens
Added development environment.
757ef7f
@martinkilbinger
Added pyproject
373722e
@martinkilbinger
canfar pyproject update
b025b6a
@martinkilbinger
cfis vos configs: missing keywords, DR5 added
ba135f2
@martinkilbinger
Testing dockerfile with only conda env installed
07cafb4
@martinkilbinger
Fixing numpy and astropy versions
92a999c
@martinkilbinger
installation on canfar working: removed most versions from yml file; …
2b6600d 
…added init_canfar.sh script
@martinkilbinger
Dockerfile for image 0:7, 0:8
b6e5c97
@martinkilbinger
Installation of sextractor and psfex with conda
bc66565
@martinkilbinger
script to call curl with canfar contained updated, adding NCORE as ar…
0b3aac6 
…gument
@martinkilbinger
added init scripts for canfar; job_sp added n_smp for further jobs
69317cb
@martinkilbinger
script to call curl for canfar container: added resources
d35bd69
@martinkilbinger
testing input numbers
d93a60e
@martinkilbinger
removed debug msg
fb83a27
@martinkilbinger
numpy error fixed with version upgrade
e33972b
@martinkilbinger
Merge branch 'science_portal_run' of github.com:martinkilbinger/shape…
edbec76 
…pipe-1 into science_portal_run
@martinkilbinger
Getting ready for exclusive-one-tile processing
9aa16be
@martinkilbinger
Added command line option to specify exclusive ID for processing
e5d0335
@martinkilbinger
Merge remote-tracking branch 'origin/exclusive' into science_portal_run
49d8880
@martinkilbinger
curl script exclusive ID
d02347e
@martinkilbinger
Dockerfile conda -> source activate
12e6b63
@martinkilbinger
Merge remote-tracking branch 'origin/docker_image' into docker_image
7d20699 
Conflicts:
	Dockerfile
	environment.yml
	scripts/sh/init_canfar.sh
martinkilbinger and others added 25 commits March 6, 2024 13:26
@martinkilbinger
Merge pull request #13 from martinkilbinger/docker_image
8b92dbf 
Docker image
@martinkilbinger
Merge remote-tracking branch 'origin/develop' into develop
fe1eb3a
@martinkilbinger
Merge remote-tracking branch 'origin/develop' into plot_spectro
720afe9
@martinkilbinger
Merge pull request #14 from martinkilbinger/plot_spectro
07a5924 
spectroscopic data for plotting
@martinkilbinger
Merge remote-tracking branch 'origin/develop' into develop
4ce26ba
@martinkilbinger
remove centos ci
a6bf8a5
@martinkilbinger
Merge branch 'develop' of github.com:martinkilbinger/shapepipe-1 into…
339f13f 
… develop
@martinkilbinger
repaired plot spectro notebook
bddc491
@martinkilbinger
added doc string
4dffd47
@martinkilbinger
Merge branch 'develop' of github.com:martinkilbinger/shapepipe-1 into…
41cfd97 
… develop
@martinkilbinger
python example runner: added back mccd and pysap
5675c06
@martinkilbinger
corrected typo in doc string
14569b2
@martinkilbinger
updated canfar pipeline doc
b406438
@martinkilbinger
fixed combined mask input dir
fe66831
@martinkilbinger
added parameters to final cat
282d76b
@martinkilbinger
summary
9ac6bb4
@martinkilbinger
Removed rarely used ngmix njob/ngal options; splits computed automati…
25ef4e2 
…cally
@martinkilbinger
canfar init + run job: removed prev Ms and Mc dirs for job 256
75fb975
@martinkilbinger
merge sep cats: error if ngmix #HDUs < 6
376bbf1
@martinkilbinger
Merge pull request #15 from martinkilbinger/cleanup_canfar
06564a1 
Cleanup canfar
@martinkilbinger
env-dev updated to min versions on canfar (docker image SP 1.1)
21deebc
@martinkilbinger
Merge remote-tracking branch 'upstream' into 651-conda-activate-fix-MK
bb15d08
@martinkilbinger
Merge remote-tracking branch 'origin/develop' into 651-conda-activate…
1ea5d4a 
…-fix-MK
minor changes
f2a5a06
@martinkilbinger
Merge remote-tracking branch 'upstream/develop' into 651-conda-activa…
925ae5b 
…te-fix-MK
@martinkilbinger martinkilbinger self-assigned this Oct 21, 2024
@sfarrens
Copy link
Member

@martinkilbinger you should keep an eye on #665, I have working CI and updated the whole build system.

@martinkilbinger martinkilbinger deleted the 651-conda-activate-fix-MK branch October 21, 2024 14:14
@martinkilbinger
Copy link
Contributor Author

@martinkilbinger you should keep an eye on #665, I have working CI and updated the whole build system.

I'm cleaning up, merging to my fork and deleting a few old branches. That will hopefully make it easier to merge my current branch (running SP v1.4) to upstream later.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@martinkilbinger martinkilbinger

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@martinkilbinger @sfarrens