Skip to content

udpated hebcal_test.go to account for updated zmanim list #9

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

Open
MaxBGreenberg wants to merge 18 commits into
base: main
Choose a base branch
from
Open

udpated hebcal_test.go to account for updated zmanim list #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f6b38d6
changed github.com/hebcal/hebcal-go to github.com/MaxBGreenber/hebcal-go
MaxBGreenberg Jan 17, 2024
f8d13b8
corrected module path error in nachyomi_test.go
MaxBGreenberg Jan 17, 2024
5684810
fixed error in module name
MaxBGreenberg Jan 17, 2024
c44fbef
Moved Magen Avraham times to be displayed before Gra times
MaxBGreenberg Jan 17, 2024
0e74ca6
removed remaning references to github.com/hebcal/hebcal-go in files
MaxBGreenberg Jan 18, 2024
7b53829
added explicity mention of the gra in zmanim printout for his shita
MaxBGreenberg Jan 18, 2024
3d3f2a7
change tzeis hakochavim from 8.5 degrees to 7.083 degrees
MaxBGreenberg Jan 18, 2024
45b00a9
changed tzeis shita from 3 small stars to 3 medium stars in candles.go
MaxBGreenberg Jan 18, 2024
96f417e
remove civil dawn and civil dusk (6 degrees) from zmanim printout
MaxBGreenberg Jan 18, 2024
412e36a
Added bein hashmashos calculation to zmanim.go
MaxBGreenberg Jan 18, 2024
467a161
added printing of zman for bein hashmashos to zmanim list in candles.go
MaxBGreenberg Jan 18, 2024
4811801
removed extra white space in candles.go
MaxBGreenberg Jan 18, 2024
184a319
Modified candles.go. removed earlier misheyakir from zmanim list, rel…
MaxBGreenberg Jan 18, 2024
d138b85
Update candles.go. Changed chanukka candle lighting time to bein hash…
MaxBGreenberg Jan 18, 2024
ff18893
Update candles.go. Added Chatzos Halayla to zmanim printout
MaxBGreenberg Jan 18, 2024
16c993c
Update go.mod so that minimum version needed to build is 1.13
MaxBGreenberg Jan 18, 2024
647eb80
updated hebcal_test.go to account for format of zmanim
MaxBGreenberg Jan 30, 2024
33c1fa8
added zman sof zmam biur chametz for gra and mga to zmanim.go
MaxBGreenberg Feb 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dafyomi/dafyomi_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"time"

"github.com/hebcal/hdate"
"github.com/hebcal/hebcal-go/dafyomi"
"github.com/MaxBGreenberg/hebcal-go/dafyomi"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions event/dafyomi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"github.com/hebcal/gematriya"
"github.com/hebcal/hdate"
"github.com/hebcal/hebcal-go/dafyomi"
"github.com/hebcal/hebcal-go/locales"
"github.com/MaxBGreenberg/hebcal-go/dafyomi"
"github.com/MaxBGreenberg/hebcal-go/locales"
)

type dafYomiEvent struct {
Expand Down
4 changes: 2 additions & 2 deletions event/event_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"testing"

"github.com/hebcal/hdate"
"github.com/hebcal/hebcal-go/event"
"github.com/hebcal/hebcal-go/sedra"
"github.com/MaxBGreenberg/hebcal-go/event"
"github.com/MaxBGreenberg/hebcal-go/sedra"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion event/hdate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/dustin/go-humanize"
"github.com/hebcal/gematriya"
"github.com/hebcal/hdate"
"github.com/hebcal/hebcal-go/locales"
"github.com/MaxBGreenberg/hebcal-go/locales"
)

type hebrewDateEvent struct {
Expand Down
2 changes: 1 addition & 1 deletion event/holiday.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"regexp"

"github.com/hebcal/hdate"
"github.com/hebcal/hebcal-go/locales"
"github.com/MaxBGreenberg/hebcal-go/locales"
)

// HolidayEvent represents a built-in holiday like Pesach, Purim or Tu BiShvat
Expand Down
4 changes: 2 additions & 2 deletions event/molad.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"

"github.com/hebcal/hdate"
"github.com/hebcal/hebcal-go/locales"
"github.com/hebcal/hebcal-go/molad"
"github.com/MaxBGreenberg/hebcal-go/locales"
"github.com/MaxBGreenberg/hebcal-go/molad"
)

type moladEvent struct {
Expand Down
4 changes: 2 additions & 2 deletions event/myomi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"strconv"

"github.com/hebcal/hdate"
"github.com/hebcal/hebcal-go/locales"
"github.com/hebcal/hebcal-go/mishnayomi"
"github.com/MaxBGreenberg/hebcal-go/locales"
"github.com/MaxBGreenberg/hebcal-go/mishnayomi"
)

type mishnaYomiEvent struct {
Expand Down
4 changes: 2 additions & 2 deletions event/nachyomi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"github.com/hebcal/gematriya"
"github.com/hebcal/hdate"
"github.com/hebcal/hebcal-go/dafyomi"
"github.com/hebcal/hebcal-go/locales"
"github.com/MaxBGreenberg/hebcal-go/dafyomi"
"github.com/MaxBGreenberg/hebcal-go/locales"
)

type nachYomiEvent struct {
Expand Down
4 changes: 2 additions & 2 deletions event/parsha.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"strings"

"github.com/hebcal/hdate"
"github.com/hebcal/hebcal-go/locales"
"github.com/hebcal/hebcal-go/sedra"
"github.com/MaxBGreenberg/hebcal-go/locales"
"github.com/MaxBGreenberg/hebcal-go/sedra"
)

// Represents one of 54 weekly Torah portions, always on a Saturday
Expand Down
4 changes: 2 additions & 2 deletions event/yyomi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"github.com/hebcal/gematriya"
"github.com/hebcal/hdate"
"github.com/hebcal/hebcal-go/dafyomi"
"github.com/hebcal/hebcal-go/locales"
"github.com/MaxBGreenberg/hebcal-go/dafyomi"
"github.com/MaxBGreenberg/hebcal-go/locales"
)

type yyomiEvent struct {
Expand Down
11 changes: 8 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
module github.com/hebcal/hebcal-go
module github.com/MaxBGreenberg/hebcal-go

go 1.13

require github.com/stretchr/testify v1.8.1

require (
github.com/dustin/go-humanize v1.0.1
github.com/hebcal/gematriya v1.0.1
github.com/hebcal/greg v1.0.0
github.com/hebcal/hdate v1.0.2
github.com/nathan-osman/go-sunrise v1.1.0
github.com/stretchr/testify v1.8.4
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
3 changes: 2 additions & 1 deletion go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSS
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
Expand Down
24 changes: 13 additions & 11 deletions hebcal/candles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"time"

"github.com/hebcal/hdate"
"github.com/hebcal/hebcal-go/event"
"github.com/hebcal/hebcal-go/locales"
"github.com/hebcal/hebcal-go/zmanim"
"github.com/MaxBGreenberg/hebcal-go/event"
"github.com/MaxBGreenberg/hebcal-go/locales"
"github.com/MaxBGreenberg/hebcal-go/zmanim"
)

func formatTime(t *time.Time, opts *CalOptions) string {
Expand Down Expand Up @@ -162,7 +162,7 @@ func makeChanukahCandleLighting(ev event.HolidayEvent, opts *CalOptions) TimedEv
year, month, day := hd.Greg()
gregDate := time.Date(year, month, day, 0, 0, 0, 0, time.UTC)
z := zmanim.New(loc, gregDate)
candleLightingTime := z.Dusk()
candleLightingTime := z.Tzeit(zmanim.Tzeit3MediumStars)
if (candleLightingTime == time.Time{}) {
return TimedEvent{} // no sunset
}
Expand Down Expand Up @@ -243,21 +243,23 @@ func dailyZemanim(date hdate.HDate, opts *CalOptions) []event.CalEvent {
t time.Time
}{
{"Alot haShachar", z.AlotHaShachar()},
{"Misheyakir", z.Misheyakir()},
{"Misheyakir Machmir", z.MisheyakirMachmir()},
{"Dawn", z.Dawn()},
//{"Misheyakir", z.Misheyakir()},
{"Misheyakir", z.MisheyakirMachmir()},
//{"Dawn", z.Dawn()},
{"Sunrise", z.Sunrise()},
{"Kriat Shema, sof zeman", z.SofZmanShma()},
{"Kriat Shema, sof zeman (MGA)", z.SofZmanShmaMGA()},
{"Tefilah, sof zeman", z.SofZmanTfilla()},
{"Kriat Shema, sof zeman (GRA)", z.SofZmanShma()},
{"Tefilah, sof zeman (MGA)", z.SofZmanTfillaMGA()},
{"Tefilah, sof zeman (GRA)", z.SofZmanTfilla()},
{"Chatzot hayom", z.Chatzot()},
{"Mincha Gedolah", z.MinchaGedola()},
{"Mincha Ketanah", z.MinchaKetana()},
{"Plag HaMincha", z.PlagHaMincha()},
{"Sunset", z.Sunset()},
{"Dusk", z.Dusk()},
{"Tzeit HaKochavim", z.Tzeit(zmanim.Tzeit3SmallStars)},
{"Bein HaShemashot", z.BeinHashmashos()},
//{"Dusk", z.Dusk()},
{"Tzeit HaKochavim", z.Tzeit(zmanim.Tzeit3MediumStars)},
{"Chatzoz Halayla", z.ChatzotNight()},
}
events := make([]event.CalEvent, 0, len(times))
for _, zman := range times {
Expand Down
18 changes: 9 additions & 9 deletions hebcal/hebcal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ import (

"github.com/hebcal/greg"
"github.com/hebcal/hdate"
"github.com/hebcal/hebcal-go/dafyomi"
"github.com/hebcal/hebcal-go/event"
"github.com/hebcal/hebcal-go/mishnayomi"
"github.com/hebcal/hebcal-go/molad"
"github.com/hebcal/hebcal-go/nachyomi"
"github.com/hebcal/hebcal-go/omer"
"github.com/hebcal/hebcal-go/sedra"
"github.com/hebcal/hebcal-go/yerushalmi"
"github.com/hebcal/hebcal-go/zmanim"
"github.com/MaxBGreenberg/hebcal-go/dafyomi"
"github.com/MaxBGreenberg/hebcal-go/event"
"github.com/MaxBGreenberg/hebcal-go/mishnayomi"
"github.com/MaxBGreenberg/hebcal-go/molad"
"github.com/MaxBGreenberg/hebcal-go/nachyomi"
"github.com/MaxBGreenberg/hebcal-go/omer"
"github.com/MaxBGreenberg/hebcal-go/sedra"
"github.com/MaxBGreenberg/hebcal-go/yerushalmi"
"github.com/MaxBGreenberg/hebcal-go/zmanim"
)

/*
Expand Down
12 changes: 6 additions & 6 deletions hebcal/hebcal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"time"

"github.com/hebcal/hdate"
"github.com/hebcal/hebcal-go/event"
"github.com/hebcal/hebcal-go/hebcal"
"github.com/hebcal/hebcal-go/yerushalmi"
"github.com/hebcal/hebcal-go/zmanim"
"github.com/MaxBGreenberg/hebcal-go/event"
"github.com/MaxBGreenberg/hebcal-go/hebcal"
"github.com/MaxBGreenberg/hebcal-go/yerushalmi"
"github.com/MaxBGreenberg/hebcal-go/zmanim"
"github.com/stretchr/testify/assert"
)

Expand Down Expand Up @@ -421,10 +421,10 @@ func TestDailyZemanim(t *testing.T) {
"2021-11-27 Misheyakir Machmir: 05:54",
"2021-11-27 Dawn: 06:18",
"2021-11-27 Sunrise: 06:49",
"2021-11-27 Kriat Shema, sof zeman: 09:11",
"2021-11-27 Kriat Shema, sof zeman (MGA): 08:35",
"2021-11-27 Tefilah, sof zeman: 09:58",
"2021-11-27 Kriat Shema, sof zeman (GRA): 09:11",
"2021-11-27 Tefilah, sof zeman (MGA): 09:34",
"2021-11-27 Tefilah, sof zeman (GRA): 09:58",
"2021-11-27 Chatzot hayom: 11:33",
"2021-11-27 Mincha Gedolah: 11:57",
"2021-11-27 Mincha Ketanah: 14:19",
Expand Down
4 changes: 2 additions & 2 deletions hebcal/holidays.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"time"

"github.com/hebcal/hdate"
"github.com/hebcal/hebcal-go/event"
"github.com/hebcal/hebcal-go/sedra"
"github.com/MaxBGreenberg/hebcal-go/event"
"github.com/MaxBGreenberg/hebcal-go/sedra"
)

type holiday struct {
Expand Down
4 changes: 2 additions & 2 deletions hebcal/holidays_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"testing"

"github.com/hebcal/hdate"
"github.com/hebcal/hebcal-go/event"
"github.com/hebcal/hebcal-go/hebcal"
"github.com/MaxBGreenberg/hebcal-go/event"
"github.com/MaxBGreenberg/hebcal-go/hebcal"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion hebcal/nachyomi_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"time"

"github.com/hebcal/hdate"
"github.com/hebcal/hebcal-go/hebcal"
"github.com/MaxBGreenberg/hebcal-go/hebcal"
"github.com/stretchr/testify/assert"
)

Expand Down
6 changes: 3 additions & 3 deletions hebcal/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"time"

"github.com/hebcal/hdate"
"github.com/hebcal/hebcal-go/event"
"github.com/hebcal/hebcal-go/yerushalmi"
"github.com/hebcal/hebcal-go/zmanim"
"github.com/MaxBGreenberg/hebcal-go/event"
"github.com/MaxBGreenberg/hebcal-go/yerushalmi"
"github.com/MaxBGreenberg/hebcal-go/zmanim"
)

// UserEvent is used for generating a non-yahrtzeit user event.
Expand Down
2 changes: 1 addition & 1 deletion mishnayomi/myomi_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"time"

"github.com/hebcal/hdate"
"github.com/hebcal/hebcal-go/mishnayomi"
"github.com/MaxBGreenberg/hebcal-go/mishnayomi"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions molad/molad_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"testing"

"github.com/hebcal/hdate"
"github.com/hebcal/hebcal-go/event"
"github.com/hebcal/hebcal-go/molad"
"github.com/MaxBGreenberg/hebcal-go/event"
"github.com/MaxBGreenberg/hebcal-go/molad"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion nachyomi/nachyomi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (

"github.com/hebcal/greg"
"github.com/hebcal/hdate"
"github.com/hebcal/hebcal-go/dafyomi"
"github.com/MaxBGreenberg/hebcal-go/dafyomi"
)

// Nach Yomi takes slightly longer than two years,
Expand Down
4 changes: 2 additions & 2 deletions nachyomi/nachyomi_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"time"

"github.com/hebcal/hdate"
"github.com/hebcal/hebcal-go/dafyomi"
"github.com/hebcal/hebcal-go/nachyomi"
"github.com/MaxBGreenberg/hebcal-go/dafyomi"
"github.com/MaxBGreenberg/hebcal-go/nachyomi"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions omer/omer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"github.com/dustin/go-humanize"
"github.com/hebcal/gematriya"
"github.com/hebcal/hdate"
"github.com/hebcal/hebcal-go/event"
"github.com/hebcal/hebcal-go/locales"
"github.com/MaxBGreenberg/hebcal-go/event"
"github.com/MaxBGreenberg/hebcal-go/locales"
)

type OmerEvent struct {
Expand Down
2 changes: 1 addition & 1 deletion omer/omer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"

"github.com/hebcal/hdate"
"github.com/hebcal/hebcal-go/omer"
"github.com/MaxBGreenberg/hebcal-go/omer"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion sedra/sedra_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"time"

"github.com/hebcal/hdate"
"github.com/hebcal/hebcal-go/sedra"
"github.com/MaxBGreenberg/hebcal-go/sedra"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion yerushalmi/yyomi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/hebcal/greg"
"github.com/hebcal/hdate"
"github.com/hebcal/hebcal-go/dafyomi"
"github.com/MaxBGreenberg/hebcal-go/dafyomi"
)

// Using the Vilna edition, the Yerushalmi Daf Yomi program takes
Expand Down
4 changes: 2 additions & 2 deletions yerushalmi/yyomi_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"time"

"github.com/hebcal/hdate"
"github.com/hebcal/hebcal-go/dafyomi"
"github.com/hebcal/hebcal-go/yerushalmi"
"github.com/MaxBGreenberg/hebcal-go/dafyomi"
"github.com/MaxBGreenberg/hebcal-go/yerushalmi"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion zmanim/location_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package zmanim_test
import (
"testing"

"github.com/hebcal/hebcal-go/zmanim"
"github.com/MaxBGreenberg/hebcal-go/zmanim"
)

func TestNoDuplicateCities(t *testing.T) {
Expand Down
Loading