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

Copy package-lock.json when creating BS5 theme from tarball. #245

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 8 additions & 5 deletions admin-manual/customization/theming.rst
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,14 @@ Additional steps for tarball installations:
If not already installed, first `download the node.js binary distributuion
<https://nodejs.org/en/download>`_ and export the PATH variable.

The tarball is missing two required files for this: copy the
`package.json <https://github.com/artefactual/atom/blob/stable/2.7.x/package.json>`_
and `webpack.config.js <https://github.com/artefactual/atom/blob/stable/2.7.x/webpack.config.js>`_
from the *correct stable branch* (*stable/2.7.x* for AtoM 2.7) of our
`AtoM repo <https://github.com/artefactual/atom/>`_.
The tarball is missing three required files for this:

* :version-ref:`package.json<https://github.com/artefactual/atom/blob/stable/{version}.x/package.json>`
* :version-ref:`package-lock.json<https://github.com/artefactual/atom/blob/stable/{version}.x/package-lock.json>`
* :version-ref:`webpack.config.js <https://github.com/artefactual/atom/blob/stable/{version}.x/webpack.config.js>`

Copy the above files from the *correct stable branch*
(stable/|version|.x for AtoM |version|) of our `AtoM repo <https://github.com/artefactual/atom/>`_.

Test that everything has been installed correctly:

Expand Down
13 changes: 8 additions & 5 deletions admin-manual/installation/upgrading.rst
Original file line number Diff line number Diff line change
Expand Up @@ -380,11 +380,14 @@ Additional steps for tarball installations:
If not already installed, first `download the node.js binary distributuion
<https://nodejs.org/en/download>`_ and export the PATH variable.

The tarball is missing two required files for this: copy the
`package.json <https://github.com/artefactual/atom/blob/stable/2.7.x/package.json>`_
and `webpack.config.js <https://github.com/artefactual/atom/blob/stable/2.7.x/webpack.config.js>`_
from the *correct stable branch* ("stable/|version|" for AtoM |version|) of our
`AtoM repo <https://github.com/artefactual/atom/>`_.
The tarball is missing three required files for this:

* :version-ref:`package.json<https://github.com/artefactual/atom/blob/stable/{version}.x/package.json>`
* :version-ref:`package-lock.json<https://github.com/artefactual/atom/blob/stable/{version}.x/package-lock.json>`
* :version-ref:`webpack.config.js <https://github.com/artefactual/atom/blob/stable/{version}.x/webpack.config.js>`

Copy the above files from the *correct stable branch*
(stable/|version|.x for AtoM |version|) of our `AtoM repo <https://github.com/artefactual/atom/>`_.

Test that everything has been installed correctly:

Expand Down
4 changes: 3 additions & 1 deletion conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,11 @@
# built documents.
#
# The short X.Y version.
version = "2.7"
# version = "2.7"
# The full version, including alpha/beta/rc tags.
release = "2.7.3"
version = '.'.join(release.split('.')[:2])
extensions = ['sphinx_version_ref']

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
sphinx
sphinx_rtd_theme
sphinx_version_ref
Loading