merge: #17 from NaturalHistoryMuseum/dev

NaturalHistoryMuseum · Dec 12, 2022 · c918eeb · c918eeb
2 parents 8d892b6 + c2be61f
commit c918eeb
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -64,6 +64,11 @@ Installing from a `pyproject.toml` in editable mode (i.e. `pip install -e`) requ
    ckan.plugins = ... gbif
    ```
 
+2. Install `lessc` globally:
+   ```shell
+   npm install -g "less@~4.1"
+   ```
+
 <!--installation-end-->
 
 # Configuration

diff --git a/ckanext/gbif/theme/assets/webassets.yml b/ckanext/gbif/theme/assets/webassets.yml
@@ -1,8 +1,6 @@
 main-css:
   output: ckanext-gbif/%(version)s_gbif.css
   filters: less
-  config:
-    LESS_BIN: ../../../../../node_modules/less/bin/lessc
   contents:
     - less/gbif.less
 

diff --git a/package.json b/package.json
diff --git a/pyproject.toml b/pyproject.toml
@@ -19,9 +19,9 @@ classifiers = [
     "Programming Language :: Python :: 3.8"
 ]
 dependencies = [
-    "ckantools>=0.3.0",
     "python-dateutil",
-    "requests"
+    "requests",
+    "ckantools>=0.3.0"
 ]
 
 [project.optional-dependencies]
@@ -52,14 +52,16 @@ zip-safe = false
 [tool.setuptools.packages.find]
 exclude = ["tests", "docs"]
 
+[tool.setuptools.package-data]
+"ckanext.gbif.theme" = ["*", "**/*"]
+
 [tool.commitizen]
 name = "cz_nhm"
 version = "2.1.1"
 tag_format = "v$version"
 update_changelog_on_bump = true
 changelog_incremental = true
 version_files = [
-    "package.json",
     "pyproject.toml:version"
 ]
 

diff --git a/setup.py b/setup.py
@@ -6,5 +6,5 @@
 
 import setuptools
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     setuptools.setup()