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

MAINT: merge main into module/halos #581

Merged
merged 59 commits into from
Dec 15, 2022
Merged

MAINT: merge main into module/halos #581

merged 59 commits into from
Dec 15, 2022

Conversation

itrharrison
Copy link
Contributor

Description

Checklist

  • Follow the Contributor Guidelines
  • Write unit tests
  • Write documentation strings
  • Assign someone from your working team to review this pull request
  • Assign someone from the infrastructure team to review this pull request

rrjbca and others added 30 commits February 22, 2021 13:02
@rrjbca
Update name of default branch to main (#434)
926cbeb
@ntessore
update mailmap (#432)
c949028
@rrjbca
Write all tables to a single FITS/HDF5 file (#425)
3e5e7fd
@ntessore
ADR 3: Position sampling and patches of the sky (#422)
f99783e
@rrjbca
BUG: Raise ImportError if optional dependency speclite is not install…
9edfa92 
…ed (#437)
@rrjbca
MAINT: Set NumPy latest supported version to 1.20 #440
4c8c337
@rrjbca
Update status badges (#441)
fad2b76
@Lucia-Fonseca
MAINT: Update Lucia affiliation (#451)
79fba93
@sutieng
MAINT: add SIT's information (#450)
7279cd5
@Lucia-Fonseca @rrjbca @ntessore
DOC: Fix contributor guidelines link (#449)
39a9f9d 
Co-authored-by: Richard R <58728519+rrjbca@users.noreply.github.com>
Co-authored-by: Nicolas Tessore <n.tessore@ucl.ac.uk>
@rrjbca
ENH: Logging for skypy command line script and Pipeline class (#453)
1281106
@philipp128
DOC: Describe speclite filters in documentation (#457)
f9940ed
@rrjbca
ENH: Config syntax for importing objects (#463)
eb43a42
@Lucia-Fonseca
DOC: List of Features (#456)
2fb6364
@Lucia-Fonseca
DOC: How to construct config files (#454)
101ad83
@rrjbca
DOC: Remove docstring examples (#429)
034814b
@rrjbca
MAINT: Update Zenodo entry for RPR (#468)
b377ea0
@itrharrison
DOC: Readme updates (#460)
39f5a2b
@itrharrison
DOC: Expanded landing page documentation (#228)
15e1ded
@rrjbca
DOC: Inverse transform sampling accuracy warning (#472)
cea1f02
@rrjbca
MAINT: Set astropy latest supported version to 4.2 (#483)
3ece211
@Lucia-Fonseca
DOC: zenodo json members update (#481)
0916369
@Lucia-Fonseca
DOC: Ryden04 ellipticity doc missing section (#477)
6b1c370
@rrjbca
MAINT: Update numpy and scipy latest supported versions (#488)
76c36e8
@rrjbca
BUG: Change invalid ecsv datatype from int to uint16 (#485)
ea35ff5
@rrjbca @ntessore
DEV: setuptools==58.0.0 (#493)
40456ee 
Co-authored-by: Nicolas Tessore <n.tessore@ucl.ac.uk>
@rrjbca
Add compatibility workflow badge (#487)
8b95ecb
@rrjbca
DEV: Enable pip to install pre-releases in the tox dev environments (#…
6d4e7bb 
…491)
@rrjbca
TST: Use tmp_path fixture for temporary files in unit tests (#489)
c2cb389
@rrjbca
BUG: Move handling of context arguments after handling of .depends ke…
a0ef308 
…yword (#465)
rrjbca and others added 12 commits February 28, 2022 08:34
@rrjbca
BLD: Set scipy latest supported version to 1.8 (#510)
97e46ee
@philipp128
ENH: Rykoff model of the magnitude uncertainty (#526)
72223ad
@rrjbca
TST: assert photometric error is numerically close to the analytic va…
f30489c 
…lue (#545)
@rrjbca
TST: Drop deprecated astropy.tests.helper.raises (#546)
270dc33
@ntessore @itrharrison @Lucia-Fonseca
ENH: compute kcorrect remaining stellar mass (#476)
60d8063 
* compute kcorrect remaining stellar mass

* added test for stellar mass remain

Co-authored-by: Ian Harrison <itrharrison@gmail.com>
Co-authored-by: Lucia F. de la Bella <55983939+Lucia-Fonseca@users.noreply.github.com>
@philipp128
ENH: Logistic completeness function (#521)
22ebe38
@rrjbca
BLD: Set astropy latest supported version to 5.1 (#547)
1dbda85
@philipp128
BUG: schechter_smf callable input and docs (#525)
3b275c6
@Fox-Davidson
DOC: Typo in Rykoff error (#550)
90b532b
@Lucia-Fonseca @rrjbca
add Fox's details (#551)
27cf8ce 
Co-authored-by: Richard R <58728519+rrjbca@users.noreply.github.com>
@rrjbca
BLD: Set numpy latest supported version to 1.23 (#552)
b2840ce
@itrharrison
merge fix
0432987
@itrharrison itrharrison requested a review from a team as a code owner November 21, 2022 16:43
WillHartley
WillHartley approved these changes Dec 15, 2022
View reviewed changes
Copy link

@WillHartley WillHartley left a comment

Choose a reason for hiding this comment

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

Looks good.
This is just to update haloes to be concurrent with main.

@itrharrison itrharrison merged commit 3496ac0 into module/halos Dec 15, 2022
rrjbca added a commit that referenced this pull request Jan 24, 2023
@rrjbca
Revert "MAINT: merge main into module/halos (#581)"
31cf7ea 
This reverts commit 3496ac0.
@rrjbca rrjbca mentioned this pull request Jan 24, 2023
Closed
rrjbca added a commit to rrjbca/skypy that referenced this pull request Jan 24, 2023
@rrjbca
Revert "MAINT: merge main into module/halos (skypyproject#581)"
2aafe1d 
This reverts commit 3496ac0.
rrjbca added a commit to rrjbca/skypy that referenced this pull request Jan 24, 2023
@rrjbca
Revert "MAINT: merge main into module/halos (skypyproject#581)"
7014112 
This reverts commit 3496ac0.
rrjbca added a commit to rrjbca/skypy that referenced this pull request Jan 24, 2023
@rrjbca
Revert "MAINT: merge main into module/halos (skypyproject#581)"
362db09 
This reverts commit 3496ac0.
rrjbca added a commit to rrjbca/skypy that referenced this pull request Jan 28, 2023
@rrjbca
Revert "MAINT: merge main into module/halos (skypyproject#581)"
83c44f4 
This reverts commit 3496ac0.
rrjbca added a commit to rrjbca/skypy that referenced this pull request Jan 28, 2023
@rrjbca
Revert "MAINT: merge main into module/halos (skypyproject#581)"
9a47a00 
This reverts commit 3496ac0.
rrjbca added a commit to rrjbca/skypy that referenced this pull request Jan 28, 2023
@rrjbca
Revert "MAINT: merge main into module/halos (skypyproject#581)"
7179972 
This reverts commit 3496ac0.
rrjbca added a commit to rrjbca/skypy that referenced this pull request Jan 28, 2023
@rrjbca
Revert "MAINT: merge main into module/halos (skypyproject#581)"
d5cba5e 
This reverts commit 3496ac0.
rrjbca added a commit to rrjbca/skypy that referenced this pull request Jan 28, 2023
@rrjbca
Revert "MAINT: merge main into module/halos (skypyproject#581)"
cb0b147 
This reverts commit 3496ac0.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@WillHartley WillHartley WillHartley approved these changes

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

Successfully merging this pull request may close these issues.
8 participants
@itrharrison @WillHartley @rrjbca @ntessore @Lucia-Fonseca @sutieng @philipp128 @Fox-Davidson