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

Djones tasks #222

Merged
merged 6 commits into from
Apr 30, 2024
Merged

Djones tasks #222

merged 6 commits into from
Apr 30, 2024

Conversation

djones1040
Copy link
Collaborator

Fixes # .

Description of the Change

Checklist

Please check all that apply to your proposed changes

  • HTML code change
  • Added package dependency
  • Added data
  • Changed django model
  • Documentation change
  • Added or changed TaskRunner

Additional context

@djones1040 djones1040 merged commit 4763792 into main Apr 30, 2024
2 of 3 checks passed
@djones1040 djones1040 deleted the djones-tasks branch April 30, 2024 02:41
manning-ncsa added a commit that referenced this pull request May 4, 2024
@manning-ncsa
Merge main
e40fc12 
commit 337b877
Merge: 4763792 a658993
Author: David Jones <[email protected]>
Date:   Mon Apr 29 17:05:43 2024 -1000

    Merge pull request #223 from astrophpeter/djones-cutout-fixes-2

    one more cutout problem

commit a658993
Author: David Jones <[email protected]>
Date:   Mon Apr 29 17:04:05 2024 -1000

    one more cutout problem

commit 4763792
Merge: ac8c6a1 ed637ec
Author: David Jones <[email protected]>
Date:   Mon Apr 29 16:41:21 2024 -1000

    Merge pull request #222 from astrophpeter/djones-tasks

    Djones tasks

commit ed637ec
Merge: de1126b 4f3619e
Author: David Jones <[email protected]>
Date:   Mon Apr 29 16:39:41 2024 -1000

    removing debug lines, and merge conflicts

commit de1126b
Author: David Jones <[email protected]>
Date:   Mon Apr 29 16:37:36 2024 -1000

    removed debug lines

commit 4f3619e
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Tue Apr 30 02:37:13 2024 +0000

    [pre-commit.ci] auto fixes from pre-commit.com hooks

    for more information, see https://pre-commit.ci

commit ad7e0ee
Author: David Jones <[email protected]>
Date:   Mon Apr 29 16:35:39 2024 -1000

    task prereqs and a couple speed enhancements

commit ac8c6a1
Merge: 4644ee8 4cb7c21
Author: T. Andrew Manning <[email protected]>
Date:   Mon Apr 29 15:09:37 2024 -0500

    Merge pull request #219 from astrophpeter/favicon

    Add favicon

commit 05e8b79
Merge: f05501d 4644ee8
Author: David Jones <[email protected]>
Date:   Mon Apr 29 07:47:55 2024 -1000

    Merge branch 'main' of github.com:astrophpeter/blast

commit f05501d
Author: David Jones <[email protected]>
Date:   Mon Apr 29 07:47:51 2024 -1000

    task orders

commit 4644ee8
Merge: 6c74b7d b2f6e77
Author: T. Andrew Manning <[email protected]>
Date:   Mon Apr 29 11:21:56 2024 -0500

    Merge pull request #221 from astrophpeter/bokeh-update

    Bokeh update

commit b2f6e77
Author: T. Andrew Manning <[email protected]>
Date:   Mon Apr 29 11:18:16 2024 -0500

    Update base deps image

commit 84ade12
Merge: c8473f7 3e61e0b
Author: T. Andrew Manning <[email protected]>
Date:   Mon Apr 29 10:52:22 2024 -0500

    Merge branch 'bokeh-update' of github.com:astrophpeter/blast into bokeh-update

commit 3e61e0b
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Mon Apr 29 15:51:03 2024 +0000

    [pre-commit.ci] auto fixes from pre-commit.com hooks

    for more information, see https://pre-commit.ci

commit c8473f7
Merge: 3a08c21 6781117
Author: T. Andrew Manning <[email protected]>
Date:   Mon Apr 29 10:50:38 2024 -0500

    Merge branch 'bokeh-update' of github.com:astrophpeter/blast into bokeh-update

commit 3a08c21
Author: T. Andrew Manning <[email protected]>
Date:   Mon Apr 29 10:50:30 2024 -0500

    Auto-scale home page bar graph

commit 6781117
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Mon Apr 29 15:48:40 2024 +0000

    [pre-commit.ci] auto fixes from pre-commit.com hooks

    for more information, see https://pre-commit.ci

commit c457203
Author: T. Andrew Manning <[email protected]>
Date:   Mon Apr 29 10:40:22 2024 -0500

    Fix layout problems related to Bootstrap and Bokeh updates

commit 6898500
Author: T. Andrew Manning <[email protected]>
Date:   Mon Apr 29 10:39:19 2024 -0500

    Upgrade to bokeh==3.4.1 and address deprecation warnings

commit 3738052
Author: T. Andrew Manning <[email protected]>
Date:   Mon Apr 29 10:33:05 2024 -0500

    Remove unused imports in plotting_utils.py

commit 4cb7c21
Author: T. Andrew Manning <[email protected]>
Date:   Mon Apr 29 10:29:38 2024 -0500

    Add favicon

commit 6c74b7d
Merge: 63ba456 dda28b0
Author: T. Andrew Manning <[email protected]>
Date:   Sun Apr 28 21:57:11 2024 -0500

    Merge pull request #214 from astrophpeter/silk

commit dda28b0
Merge: b4f331e 63ba456
Author: T. Andrew Manning <[email protected]>
Date:   Sun Apr 28 21:49:27 2024 -0500

    Merge branch 'main' into silk

commit 63ba456
Merge: a1b66ab 5032312
Author: T. Andrew Manning <[email protected]>
Date:   Sun Apr 28 21:48:45 2024 -0500

    Merge pull request #176 from astrophpeter/dependabot/github_actions/docker/build-push-action-4

    Bump docker/build-push-action from 3 to 4

commit b4f331e
Merge: 36289d3 a1b66ab
Author: T. Andrew Manning <[email protected]>
Date:   Sun Apr 28 17:08:00 2024 -0500

    Merge branch 'main' into silk

commit a1b66ab
Merge: 310d725 051d6ab
Author: T. Andrew Manning <[email protected]>
Date:   Sun Apr 28 17:07:04 2024 -0500

    Merge pull request #213 from astrophpeter/formatting

    Address formatting issues

commit 051d6ab
Author: T. Andrew Manning <[email protected]>
Date:   Sun Apr 28 17:04:09 2024 -0500

    Remove CI workflow until a working version is created.

    codecov action is pointless without the coverage.xml
    file generated by unit test script.

commit 8f28ab0
Author: T. Andrew Manning <[email protected]>
Date:   Sun Apr 28 16:59:03 2024 -0500

    Revert to codecov/codecov-action@v3

    See codecov/codecov-action#1292

commit e42acd9
Author: T. Andrew Manning <[email protected]>
Date:   Sun Apr 28 16:56:06 2024 -0500

    Send pre-commit.ci autoupdate PRs to dedicated branch

commit 869edfc
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Sun Apr 28 21:38:20 2024 +0000

    [pre-commit.ci] auto fixes from pre-commit.com hooks

    for more information, see https://pre-commit.ci

commit f2d5bf4
Author: T. Andrew Manning <[email protected]>
Date:   Sun Apr 28 16:37:48 2024 -0500

    Downgrade Black to v23.12.1 in pre-commit config

commit 36289d3
Author: T. Andrew Manning <[email protected]>
Date:   Sun Apr 28 16:16:53 2024 -0500

    Add SILKY_INTERCEPT_PERCENT env var

commit 5032312
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Jan 31 10:05:08 2023 +0000

    Bump docker/build-push-action from 3 to 4

    Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3 to 4.
    - [Release notes](https://github.com/docker/build-push-action/releases)
    - [Commits](docker/build-push-action@v3...v4)

    ---
    updated-dependencies:
    - dependency-name: docker/build-push-action
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...

    Signed-off-by: dependabot[bot] <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@djones1040