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.

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

Use wagtail-markdown instead of custom code #116

Merged
merged 23 commits into from
Sep 6, 2022
Merged

Use wagtail-markdown instead of custom code #116

merged 23 commits into from
Sep 6, 2022

Conversation

jeriox
Copy link
Contributor

@jeriox jeriox commented Jul 5, 2022

closes #44

ToDo

@jeriox jeriox changed the title Wagtail markdown Use wagtail-markdown instead of custom code Jul 5, 2022
@frcroth frcroth linked an issue Jul 6, 2022 that may be closed by this pull request
@jeriox jeriox marked this pull request as ready for review August 29, 2022 12:59
@jeriox jeriox requested a review from frcroth August 29, 2022 12:59
@jeriox
Copy link
Contributor Author

jeriox commented Aug 29, 2022

so in theory this would be ready, but for whatever reason the CI is flaky AF on this PR. It keeps complaining that setuptools is not available in the environment although it is. In one place, upgrading setuptools and the dependency in question helped, but not in the next place

Copy link
Contributor

@frcroth frcroth left a comment

Choose a reason for hiding this comment

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

Needs to be rebased, since the migrations changed

tests/test_minutes_extensions.py Outdated Show resolved Hide resolved
# Conflicts:
#	.github/workflows/tests.yml
#	myhpi/core/migrations/0001_initial.py
#	myhpi/core/migrations/0002_minutes.py
#	myhpi/core/migrations/0013_firstlevelmenuitem_informationpage_minutes_rootpage_and_more.py
#	myhpi/settings.py
#	poetry.lock
#	pyproject.toml
@jeriox
Copy link
Contributor Author

jeriox commented Sep 5, 2022

@frcroth any idea why the installation of bootstrap suddenly fails with

Traceback (most recent call last):
  File "install-bootstrap.py", line 7, in <module>
    import requests
ModuleNotFoundError: No module named 'requests'

@frcroth
Copy link
Contributor

frcroth commented Sep 5, 2022

@frcroth any idea why the installation of bootstrap suddenly fails with

Traceback (most recent call last):
  File "install-bootstrap.py", line 7, in <module>
    import requests
ModuleNotFoundError: No module named 'requests'

Because you moved poetry install behind the bootstrap installation

@coveralls
Copy link

Pull Request Test Coverage Report for Build 2994967157

  • 35 of 36 (97.22%) changed or added relevant lines in 9 files are covered.
  • 2 unchanged lines in 2 files lost coverage.
  • Overall coverage increased (+4.5%) to 59.951%

Changes Missing Coverage Covered Lines Changed/Added Lines %
myhpi/core/markdown/fields.py 3 4 75.0%
Files with Coverage Reduction New Missed Lines %
myhpi/tenca_django/admin.py 1 0%
myhpi/tests/settings.py 1 0%
Totals Coverage Status
Change from base Build 2994640743: 4.5%
Covered Lines: 738
Relevant Lines: 1231

💛 - Coveralls

@jeriox
Copy link
Contributor Author

jeriox commented Sep 5, 2022

@frcroth any idea why the installation of bootstrap suddenly fails with

Traceback (most recent call last):
  File "install-bootstrap.py", line 7, in <module>
    import requests
ModuleNotFoundError: No module named 'requests'

Because you moved poetry install behind the bootstrap installation

thx! wasn't aware that it depends on stuff that we install

@jeriox
Copy link
Contributor Author

jeriox commented Sep 5, 2022

@frcroth as your PR at wagtail-markdown ist still not reviewed, I would vote for merging this PR and therefore closing #44 while keeping #117 open and build a PR that reintroduces the buttons once the dependency is ready

@jeriox jeriox removed a link to an issue Sep 6, 2022
@jeriox jeriox merged commit 9264d48 into main Sep 6, 2022
JesterPandemonium pushed a commit to JesterPandemonium/myHPI that referenced this pull request Sep 8, 2022
JesterPandemonium pushed a commit to JesterPandemonium/myHPI that referenced this pull request Sep 8, 2022
Bump django-bootstrap-icons from 0.7.9 to 0.8.1

Bumps [django-bootstrap-icons](https://github.com/christianwgd/django-bootstrap-icons) from 0.7.9 to 0.8.1.
- [Release notes](https://github.com/christianwgd/django-bootstrap-icons/releases)
- [Changelog](https://github.com/christianwgd/django-bootstrap-icons/blob/master/CHANGELOG.md)
- [Commits](christianwgd/django-bootstrap-icons@0.7.9...0.8.1)

---
updated-dependencies:
- dependency-name: django-bootstrap-icons
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Use new method of installing poetry

Pin poetry version

Migrate tenca to myhpi

Include localsettings in settings

Fix tenca urls

Remove localsettings references

Remove LegacyAdminURLs

Remove bootstrap4 from tenca templates

Default to deactivating mailing lists

Fix rendering of tenca pages

Add tenca admin interface

Enable usage of alternative emails

Make verbose name for mailing lists less confusing

Add README for tenca-django

Add view permissions tests and restructure tests

Calculate code coverage

Add status badges to README

Add tests for minutes and minutes lists

Update README.md for new test command

use wagtail-markdown instead of custom code (fsr-de#116)

feat: Hide menu when scrolling down

feat: Make menu responsive

feat: Add logo and favicon

refactor: Generate mobile menu first

feature: Add user navbar and minor improvements

fix: Ignore all folders starting with 'venv' in Git

fix(README): Update poetry download link

chore: Make isort skip files ignored by Git

chore: Incorporate code feedback
JesterPandemonium pushed a commit to JesterPandemonium/myHPI that referenced this pull request Sep 8, 2022
author DrEGZo <[email protected]> 1662639880 +0200
committer DrEGZo <[email protected]> 1662655253 +0200

parent 91d611b
author DrEGZo <[email protected]> 1662639880 +0200
committer DrEGZo <[email protected]> 1662655243 +0200

parent 91d611b
author DrEGZo <[email protected]> 1662639880 +0200
committer DrEGZo <[email protected]> 1662655210 +0200

parent 91d611b
author DrEGZo <[email protected]> 1662639880 +0200
committer DrEGZo <[email protected]> 1662655199 +0200

parent 91d611b
author DrEGZo <[email protected]> 1662639880 +0200
committer DrEGZo <[email protected]> 1662654752 +0200

parent 91d611b
author DrEGZo <[email protected]> 1662639880 +0200
committer DrEGZo <[email protected]> 1662654729 +0200

parent 91d611b
author DrEGZo <[email protected]> 1662639880 +0200
committer DrEGZo <[email protected]> 1662654240 +0200

Merge branch 'main' into replace-root-page

Bump django-bootstrap-icons from 0.7.9 to 0.8.1

Bumps [django-bootstrap-icons](https://github.com/christianwgd/django-bootstrap-icons) from 0.7.9 to 0.8.1.
- [Release notes](https://github.com/christianwgd/django-bootstrap-icons/releases)
- [Changelog](https://github.com/christianwgd/django-bootstrap-icons/blob/master/CHANGELOG.md)
- [Commits](christianwgd/django-bootstrap-icons@0.7.9...0.8.1)

---
updated-dependencies:
- dependency-name: django-bootstrap-icons
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Use new method of installing poetry

Pin poetry version

Migrate tenca to myhpi

Include localsettings in settings

Fix tenca urls

Remove localsettings references

Remove LegacyAdminURLs

Remove bootstrap4 from tenca templates

Default to deactivating mailing lists

Fix rendering of tenca pages

Add tenca admin interface

Enable usage of alternative emails

Make verbose name for mailing lists less confusing

Add README for tenca-django

Add view permissions tests and restructure tests

Calculate code coverage

Add status badges to README

Add tests for minutes and minutes lists

Update README.md for new test command

use wagtail-markdown instead of custom code (fsr-de#116)

feat: Hide menu when scrolling down

feat: Make menu responsive

feat: Add logo and favicon

refactor: Generate mobile menu first

feature: Add user navbar and minor improvements

fix: Ignore all folders starting with 'venv' in Git

fix(README): Update poetry download link

chore: Make isort skip files ignored by Git

chore: Incorporate code feedback
@jeriox jeriox deleted the wagtail-markdown branch November 6, 2022 14:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

Rework markdown handling
3 participants