Skip to content

Commit

Permalink
update node deps (#98)
Browse files Browse the repository at this point in the history
* Update deps

* Adjust tests to rerun less

* Skip git clean on npm prepare

* Rm old nodejs LTS versions
  • Loading branch information
ashwinvis authored Sep 30, 2023
1 parent 1aa49d4 commit 6abe3d8
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 20 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ jobs:
os:
- ubuntu-latest
node_version:
- 12
- 14
- 16
- 18
- 20
include:
- os: windows-latest
node_version: 14
node_version: 18
- os: macos-latest
node_version: 14
node_version: 18

defaults:
run:
Expand Down Expand Up @@ -65,4 +65,4 @@ jobs:
- name: Fine grained tests
run: |
micromamba activate instant-markdown
python -m pytest
python -m pytest --reruns 3 --reruns-delay 2
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,23 @@
"start": "instant-markdown-d",
"test": "cat tests/test_math.md | instant-markdown-d --mathjax --debug",
"stop": "curl -X DELETE -s -w 'status: %{http_code}' -m 3 localhost:8090",
"prepare": "genversion ./src/version.js; git clean -f;"
"prepare": "genversion ./src/version.js"
},
"dependencies": {
"highlight.js": "^10.4.1",
"highlight.js": "^11.8.0",
"markdown-it": "^13.0.1",
"markdown-it-mathjax": "^2.0.0",
"markdown-it-task-lists": "^2.1.1",
"markdown-it-front-matter": "^0.2.3",
"markdown-it-textual-uml": "^0.1.3",
"mathjax": "^2.7.5",
"mathjax-node-page": "^1.4.0",
"mermaid": "^9.1.1",
"minimist": "^1.2.5",
"send": "~0.17.1",
"socket.io": "^3.0.4"
"mathjax": "^2.7.9",
"mathjax-node-page": "^1.4.1",
"mermaid": "~10.4.0",
"minimist": "^1.2.8",
"send": "~0.17.2",
"socket.io": "^4.7.2"
},
"devDependencies": {
"genversion": "^2.1.1"
"genversion": "^3.1.1"
}
}
1 change: 0 additions & 1 deletion pytest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@
log_cli_level=info
log_format = %(asctime)s %(levelname)s %(filename)s:%(lineno)03d::%(funcName)-20s %(message)s
log_date_format = %H:%M:%S
addopts = --reruns 3 --reruns-delay 2
4 changes: 2 additions & 2 deletions src/cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const MarkdownIt = require('markdown-it'),
const mjpage = require('mathjax-node-page').mjpage;
const taskLists = require('markdown-it-task-lists');
const frontMatter = require('markdown-it-front-matter');

if (argv.version || argv.debug) {
const version= require('./version');
console.log(`instant-markdown-d version: v${version}`);
Expand Down Expand Up @@ -85,7 +85,7 @@ let md = new MarkdownIt({
}).use(taskLists, {enabled: true}).use(frontMatter, function(fm){});

if (argv.mathjax) md.use(require('markdown-it-mathjax')());
if (argv.mermaid) md.use(require('markdown-it-textual-uml'));
if (argv.mermaid) md.use(require('markdown-it-textual-uml'));

const mjPageConfig = {
format: ["TeX"],
Expand Down
2 changes: 1 addition & 1 deletion src/version.js

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

5 changes: 3 additions & 2 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def __exit__(self, exc_type, exc_val, exc_tb):
def send(self, via, markdown_file):
# Wait some time to ensure the server has launched
# TODO: find a better way: signal? return code? daemon?
for tries in range(10):
for tries in range(3):
if port_in_use(self.port):
break
else:
Expand All @@ -128,7 +128,8 @@ def send(self, via, markdown_file):
# break not encountered => port inactive
raise IOError(
"Giving up checks for port. "
"Has instant-markdown-d failed to start?"
"Has instant-markdown-d failed to start? Try running:\n"
f" cat {markdown_file} | instant-markdown-d {' '.join(self.options)}"
)

method = getattr(self, f"_send_{via}")
Expand Down

0 comments on commit 6abe3d8

Please sign in to comment.