Skip to content

Commit

Permalink
Merge pull request #1037 from jhuopensource/release/v5.6.0
Browse files Browse the repository at this point in the history
Release/v5.6.0
  • Loading branch information
JiaqiWang18 authored Sep 30, 2023
2 parents 09b3628 + 7492ce6 commit ad27c88
Show file tree
Hide file tree
Showing 19 changed files with 1,086 additions and 700 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/semesterly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,11 @@ jobs:
- run: npm run test

- name: Run Backend Tests
uses: GabrielBB/xvfb-action@v1
env:
NODE_ENV: production
host: jhu.sem.ly
DB_PORT: ${{ job.services.postgres.ports[5432] }}
with:
run: python manage.py test
run: python manage.py test

- name: Run docs
run: make html -C docs
10 changes: 5 additions & 5 deletions build/semesterly-base/requirements_base.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
setuptools==65.5.1
Pygments==2.7.4
Pygments==2.15.0
Sphinx==4.0.2
alabaster==0.7.10
argparse==1.4.0
Expand All @@ -9,9 +9,9 @@ bs4==0.0.1
django-ckeditor==6.2.0
celery==5.2.2
coverage==4.4.1
cryptography==39.0.1
cryptography==41.0.4
dateparser==1.1.0
Django==3.2.18
Django==3.2.20
django-cachalot==2.4.3
django-extensions==3.1.5
django-picklefield==3.0.1
Expand Down Expand Up @@ -44,9 +44,9 @@ pywebpush==1.4.0
PyJWT[crypto]==2.3.0
PyYAML==6.0
regex==2022.3.2
requests==2.25.1
requests==2.31.0
rollbar==0.16.1
scipy==1.7.0
scipy==1.10.0
selenium==4.1.3
simplejson==3.11.1
sphinx-autobuild==2021.3.14
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
setuptools==65.5.1
Pygments==2.7.4
Pygments==2.15.0
Sphinx==4.0.2
alabaster==0.7.10
argparse==1.4.0
Expand All @@ -8,9 +8,9 @@ black==22.3.0
bs4==0.0.1
celery==5.2.2
coverage==6.3.2
cryptography==39.0.1
cryptography==41.0.4
dateparser==1.1.0
Django==3.2.18
Django==3.2.20
django-cachalot==2.4.3
django-ckeditor==6.2.0
django-debug-toolbar==3.8.1
Expand Down Expand Up @@ -47,7 +47,7 @@ pywebpush==1.4.0
PyJWT[crypto]==2.3.0
PyYAML==6.0
regex==2022.3.2
requests==2.25.1
requests==2.31.0
rollbar==0.16.1
scipy==1.7.0
selenium==4.1.3
Expand All @@ -57,4 +57,4 @@ sphinx-rtd-theme==0.5.2
sphinxcontrib-inlinesyntaxhighlight==0.2
sphinxcontrib-websupport==1.2.4
supervisor==4.2.2
webdriver-manager==3.5.2
semly-webdriver-manager-fork==4.0.1
8 changes: 2 additions & 6 deletions searches/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,8 @@ def filter_by_times(self, sem, course_matches, filters):
operator.or_,
(
Q(
section__offering__time_start__gte="{0:0=2d}:00".format(
min_max["min"]
),
section__offering__time_end__lte="{0:0=2d}:00".format(
min_max["max"]
),
section__offering__time_start__gte=min_max["min"],
section__offering__time_end__lte=min_max["max"],
section__offering__day=day_map[min_max["day"]],
section__semester=sem,
section__section_type="L",
Expand Down
Loading

0 comments on commit ad27c88

Please sign in to comment.