Skip to content

Commit

Permalink
Merge pull request getnikola#3468 from getnikola/windows-fix-symlinks…
Browse files Browse the repository at this point in the history
…-build

Fix symlinks in ./setup.py build and pip on Windows
  • Loading branch information
Kwpolska authored Oct 20, 2020
2 parents fa208e2 + 1d0241e commit 3990c20
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
3 changes: 3 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ Features
Bugfixes
--------

* Also fix symlinks when installing from source with pip; if possible,
enable Developer Mode and run ``git config --global core.symlinks true``
before cloning the Nikola repo
* Fix ``LINK_CHECK_WHITELIST`` having issues due to mixing Unicode
and bytestrings (Issue #3466)
* Add support for ``nbconvert>=6.0.0`` (Issue #3457)
Expand Down
9 changes: 8 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import shutil
from setuptools import setup, find_packages
from setuptools.command.install import install
from setuptools.command.build_py import build_py


with open('requirements.txt', 'r') as fh:
Expand Down Expand Up @@ -98,6 +99,12 @@ def run(self):
install.run(self)


class nikola_build_py(build_py):
def run(self):
expands_symlinks_for_windows()
build_py.run(self)


setup(name='Nikola',
version='8.1.1',
description='A modular, fast, simple, static website and blog generator',
Expand Down Expand Up @@ -132,7 +139,7 @@ def run(self):
extras_require=extras,
include_package_data=True,
python_requires='>=3.5',
cmdclass={'install': nikola_install},
cmdclass={'install': nikola_install, 'build_py': nikola_build_py},
data_files=[
('share/doc/nikola', [
'docs/manual.rst',
Expand Down

0 comments on commit 3990c20

Please sign in to comment.