Skip to content

Get tests passing on Windows #47

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

Merged
merged 6 commits into from
Jan 19, 2023
Merged

Get tests passing on Windows #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
54529bf
Run tests on Windows
cpsievert Jan 18, 2023
f36052f
Change default shell to bash
cpsievert Jan 18, 2023
1cb1ae7
Hard code forward slash
cpsievert Jan 18, 2023
6f155c4
Hard code forward slash
cpsievert Jan 18, 2023
2c5476f
Run tests on MacOS
cpsievert Jan 18, 2023
54eb951
Use posixpath module
cpsievert Jan 19, 2023
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
6 changes: 5 additions & 1 deletion .github/workflows/pytest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,15 @@ on:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: [3.7, 3.8, 3.9, "3.10", "3.11"]
os: [ubuntu-latest, windows-latest, macOS-latest]
fail-fast: false
defaults:
run:
shell: bash

steps:
- uses: actions/checkout@v2
Expand Down
8 changes: 5 additions & 3 deletions htmltools/_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# pyright: reportMissingTypeStubs=false
import os
import posixpath
import shutil
import sys
import tempfile
Expand Down Expand Up @@ -1091,7 +1092,8 @@ def source_path_map(
href = self.name
if include_version:
href += "-" + str(self.version)
href = os.path.join(lib_prefix, href) if lib_prefix else href
if lib_prefix:
href = posixpath.join(lib_prefix, href)
return {"source": source, "href": href}

def as_html_tags(
Expand Down Expand Up @@ -1122,15 +1124,15 @@ def as_dict(
href = urllib.parse.quote(s["href"])
s.update(
{
"href": os.path.join(paths["href"], href),
"href": posixpath.join(paths["href"], href),
"rel": "stylesheet",
}
)

scripts = deepcopy(self.script)
for s in scripts:
src = urllib.parse.quote(s["src"])
s.update({"src": os.path.join(paths["href"], src)})
s.update({"src": posixpath.join(paths["href"], src)})

head: Optional[str]
if self.head is None:
Expand Down