2
0
Эх сурвалжийг харах

Ensure python 3.7 is used for sphinx and bump lerna version

JC Brand 6 жил өмнө
parent
commit
9a7dd99889
4 өөрчлөгдсөн 66 нэмэгдсэн , 63 устгасан
  1. 2 0
      .gitignore
  2. 2 1
      Makefile
  3. 61 61
      package-lock.json
  4. 1 1
      package.json

+ 2 - 0
.gitignore

@@ -36,9 +36,11 @@ parts
 *.pyc
 *.pyc
 *.egg-info
 *.egg-info
 lib
 lib
+lib64
 include
 include
 bin
 bin
 develop-eggs
 develop-eggs
+pyvenv.cfg
 
 
 converse-logs/*.html
 converse-logs/*.html
 
 

+ 2 - 1
Makefile

@@ -116,6 +116,7 @@ stamp-npm: $(LERNA) package.json package-lock.json src/headless/package.json
 .PHONY: clean
 .PHONY: clean
 clean:
 clean:
 	npm run clean
 	npm run clean
+	rm -r lib bin include parts
 
 
 .PHONY: dev
 .PHONY: dev
 dev: stamp-npm
 dev: stamp-npm
@@ -227,7 +228,7 @@ check: eslint dist/converse.js
 ## Documentation
 ## Documentation
 
 
 ./bin/activate:
 ./bin/activate:
-	python3 -m venv .
+	python3.7 -m venv .
 
 
 .installed.cfg: requirements.txt buildout.cfg
 .installed.cfg: requirements.txt buildout.cfg
 	./bin/pip install -r requirements.txt
 	./bin/pip install -r requirements.txt

+ 61 - 61
package-lock.json

@@ -1095,9 +1095,9 @@
       },
       },
       "dependencies": {
       "dependencies": {
         "semver": {
         "semver": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz",
-          "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==",
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
           "dev": true
         }
         }
       }
       }
@@ -1145,24 +1145,24 @@
       },
       },
       "dependencies": {
       "dependencies": {
         "semver": {
         "semver": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz",
-          "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==",
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
           "dev": true
         }
         }
       }
       }
     },
     },
     "@lerna/changed": {
     "@lerna/changed": {
-      "version": "3.16.2",
-      "resolved": "https://registry.npmjs.org/@lerna/changed/-/changed-3.16.2.tgz",
-      "integrity": "sha512-CXr4R1s/IGsLy0xjVfgFtv4Hx8gUvIgmGteRuH2Ma9bl1yMcyy8zQd/e0M+dzL6tEhjo56ZTSs9hHiU2w/uwIg==",
+      "version": "3.16.4",
+      "resolved": "https://registry.npmjs.org/@lerna/changed/-/changed-3.16.4.tgz",
+      "integrity": "sha512-NCD7XkK744T23iW0wqKEgF4R9MYmReUbyHCZKopFnsNpQdqumc3SOIvQUAkKCP6hQJmYvxvOieoVgy/CVDpZ5g==",
       "dev": true,
       "dev": true,
       "requires": {
       "requires": {
         "@lerna/collect-updates": "3.16.0",
         "@lerna/collect-updates": "3.16.0",
         "@lerna/command": "3.16.0",
         "@lerna/command": "3.16.0",
         "@lerna/listable": "3.16.0",
         "@lerna/listable": "3.16.0",
         "@lerna/output": "3.13.0",
         "@lerna/output": "3.13.0",
-        "@lerna/version": "3.16.2"
+        "@lerna/version": "3.16.4"
       }
       }
     },
     },
     "@lerna/check-working-tree": {
     "@lerna/check-working-tree": {
@@ -1259,9 +1259,9 @@
       }
       }
     },
     },
     "@lerna/conventional-commits": {
     "@lerna/conventional-commits": {
-      "version": "3.16.0",
-      "resolved": "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.16.0.tgz",
-      "integrity": "sha512-zdvhU+aI7galRyLBFDhvC8T7NbGORJiZbIw/Qgp/TzkSaJfOAE3R7J8J1OZKDgxvhOoVhzMphNycaV3DiUlERQ==",
+      "version": "3.16.4",
+      "resolved": "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.16.4.tgz",
+      "integrity": "sha512-QSZJ0bC9n6FVaf+7KDIq5zMv8WnHXnwhyL5jG1Nyh3SgOg9q2uflqh7YsYB+G6FwaRfnPaKosh6obijpYg0llA==",
       "dev": true,
       "dev": true,
       "requires": {
       "requires": {
         "@lerna/validation-error": "3.13.0",
         "@lerna/validation-error": "3.13.0",
@@ -1278,9 +1278,9 @@
       },
       },
       "dependencies": {
       "dependencies": {
         "semver": {
         "semver": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz",
-          "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==",
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
           "dev": true
         }
         }
       }
       }
@@ -1318,9 +1318,9 @@
           "dev": true
           "dev": true
         },
         },
         "semver": {
         "semver": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz",
-          "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==",
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
           "dev": true
         }
         }
       }
       }
@@ -1455,9 +1455,9 @@
       },
       },
       "dependencies": {
       "dependencies": {
         "semver": {
         "semver": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz",
-          "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==",
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
           "dev": true
         }
         }
       }
       }
@@ -1625,9 +1625,9 @@
       }
       }
     },
     },
     "@lerna/pack-directory": {
     "@lerna/pack-directory": {
-      "version": "3.16.2",
-      "resolved": "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-3.16.2.tgz",
-      "integrity": "sha512-aM8MQnkhRUW81s/UBEUKA+qRfSdf9TcJzTY9Wjrd94UxzULn1BQ+Y3F8cysTR0TS/ILLyiteIllxlVSByWHD2w==",
+      "version": "3.16.4",
+      "resolved": "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-3.16.4.tgz",
+      "integrity": "sha512-uxSF0HZeGyKaaVHz5FroDY9A5NDDiCibrbYR6+khmrhZtY0Bgn6hWq8Gswl9iIlymA+VzCbshWIMX4o2O8C8ng==",
       "dev": true,
       "dev": true,
       "requires": {
       "requires": {
         "@lerna/get-packed": "3.16.0",
         "@lerna/get-packed": "3.16.0",
@@ -1665,9 +1665,9 @@
       },
       },
       "dependencies": {
       "dependencies": {
         "semver": {
         "semver": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz",
-          "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==",
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
           "dev": true
         }
         }
       }
       }
@@ -1682,9 +1682,9 @@
       },
       },
       "dependencies": {
       "dependencies": {
         "semver": {
         "semver": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz",
-          "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==",
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
           "dev": true
         }
         }
       }
       }
@@ -1740,9 +1740,9 @@
       }
       }
     },
     },
     "@lerna/publish": {
     "@lerna/publish": {
-      "version": "3.16.2",
-      "resolved": "https://registry.npmjs.org/@lerna/publish/-/publish-3.16.2.tgz",
-      "integrity": "sha512-6CZhnzO5goChQPqcBEN+6f6wA5ERBYcKB8RlBlsG38H8f8uYNZM6m34ywy1MLihZQA0z/RWrhYWAf4daF+AUkA==",
+      "version": "3.16.4",
+      "resolved": "https://registry.npmjs.org/@lerna/publish/-/publish-3.16.4.tgz",
+      "integrity": "sha512-XZY+gRuF7/v6PDQwl7lvZaGWs8CnX6WIPIu+OCcyFPSL/rdWegdN7HieKBHskgX798qRQc2GrveaY7bNoTKXAw==",
       "dev": true,
       "dev": true,
       "requires": {
       "requires": {
         "@evocateur/libnpmaccess": "^3.1.2",
         "@evocateur/libnpmaccess": "^3.1.2",
@@ -1759,14 +1759,14 @@
         "@lerna/npm-publish": "3.16.2",
         "@lerna/npm-publish": "3.16.2",
         "@lerna/otplease": "3.16.0",
         "@lerna/otplease": "3.16.0",
         "@lerna/output": "3.13.0",
         "@lerna/output": "3.13.0",
-        "@lerna/pack-directory": "3.16.2",
+        "@lerna/pack-directory": "3.16.4",
         "@lerna/prerelease-id-from-version": "3.16.0",
         "@lerna/prerelease-id-from-version": "3.16.0",
         "@lerna/prompt": "3.13.0",
         "@lerna/prompt": "3.13.0",
         "@lerna/pulse-till-done": "3.13.0",
         "@lerna/pulse-till-done": "3.13.0",
         "@lerna/run-lifecycle": "3.16.2",
         "@lerna/run-lifecycle": "3.16.2",
         "@lerna/run-topologically": "3.16.0",
         "@lerna/run-topologically": "3.16.0",
         "@lerna/validation-error": "3.13.0",
         "@lerna/validation-error": "3.13.0",
-        "@lerna/version": "3.16.2",
+        "@lerna/version": "3.16.4",
         "figgy-pudding": "^3.5.1",
         "figgy-pudding": "^3.5.1",
         "fs-extra": "^8.1.0",
         "fs-extra": "^8.1.0",
         "npm-package-arg": "^6.1.0",
         "npm-package-arg": "^6.1.0",
@@ -1778,9 +1778,9 @@
       },
       },
       "dependencies": {
       "dependencies": {
         "semver": {
         "semver": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz",
-          "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==",
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
           "dev": true
         }
         }
       }
       }
@@ -1919,16 +1919,16 @@
       }
       }
     },
     },
     "@lerna/version": {
     "@lerna/version": {
-      "version": "3.16.2",
-      "resolved": "https://registry.npmjs.org/@lerna/version/-/version-3.16.2.tgz",
-      "integrity": "sha512-Gd4ajnhYkpIpHfuzRbcqfdiMLgOTnZfKsJDIdWsMJDoerhHFtNkhVSyaw4rQd2AIO4dCi63QxuGM9fUTFk0VKw==",
+      "version": "3.16.4",
+      "resolved": "https://registry.npmjs.org/@lerna/version/-/version-3.16.4.tgz",
+      "integrity": "sha512-ikhbMeIn5ljCtWTlHDzO4YvTmpGTX1lWFFIZ79Vd1TNyOr+OUuKLo/+p06mCl2WEdZu0W2s5E9oxfAAQbyDxEg==",
       "dev": true,
       "dev": true,
       "requires": {
       "requires": {
         "@lerna/check-working-tree": "3.14.2",
         "@lerna/check-working-tree": "3.14.2",
         "@lerna/child-process": "3.14.2",
         "@lerna/child-process": "3.14.2",
         "@lerna/collect-updates": "3.16.0",
         "@lerna/collect-updates": "3.16.0",
         "@lerna/command": "3.16.0",
         "@lerna/command": "3.16.0",
-        "@lerna/conventional-commits": "3.16.0",
+        "@lerna/conventional-commits": "3.16.4",
         "@lerna/github-client": "3.16.0",
         "@lerna/github-client": "3.16.0",
         "@lerna/gitlab-client": "3.15.0",
         "@lerna/gitlab-client": "3.15.0",
         "@lerna/output": "3.13.0",
         "@lerna/output": "3.13.0",
@@ -1951,9 +1951,9 @@
       },
       },
       "dependencies": {
       "dependencies": {
         "semver": {
         "semver": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz",
-          "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==",
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
           "dev": true
         }
         }
       }
       }
@@ -1985,9 +1985,9 @@
       "dev": true
       "dev": true
     },
     },
     "@octokit/endpoint": {
     "@octokit/endpoint": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.3.1.tgz",
-      "integrity": "sha512-4mKqSQfeTRFpQMUGIUG1ewdQT64b2YpvjG2dE1x7nhQupdI/AjdgdcIsmPtRFEXlih/uLQLRWJL4FrivpQdC7A==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.3.2.tgz",
+      "integrity": "sha512-gRjteEM9I6f4D8vtwU2iGUTn9RX/AJ0SVXiqBUEuYEWVGGAVjSXdT0oNmghH5lvQNWs8mwt6ZaultuG6yXivNw==",
       "dev": true,
       "dev": true,
       "requires": {
       "requires": {
         "deepmerge": "4.0.0",
         "deepmerge": "4.0.0",
@@ -2062,9 +2062,9 @@
       }
       }
     },
     },
     "@octokit/rest": {
     "@octokit/rest": {
-      "version": "16.28.5",
-      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-16.28.5.tgz",
-      "integrity": "sha512-W8hHSm6103c+lNdTuQBMKdZNDCOFFXJdatj92g2d6Hqk134EMDHRc02QWI/Fs1WGnWZ8Leb0QFbXPKO2njeevQ==",
+      "version": "16.28.6",
+      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-16.28.6.tgz",
+      "integrity": "sha512-ERfzS6g6ZNPJkEUclxLenr+UEncbymCe//IBrWWdp59nslYDeJboq07Ue9brX05Uv0+SY3kwA33cdiVBVPAOMQ==",
       "dev": true,
       "dev": true,
       "requires": {
       "requires": {
         "@octokit/request": "^5.0.0",
         "@octokit/request": "^5.0.0",
@@ -3672,9 +3672,9 @@
       },
       },
       "dependencies": {
       "dependencies": {
         "semver": {
         "semver": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz",
-          "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==",
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
           "dev": true
         },
         },
         "through2": {
         "through2": {
@@ -7319,14 +7319,14 @@
       }
       }
     },
     },
     "lerna": {
     "lerna": {
-      "version": "3.16.2",
-      "resolved": "https://registry.npmjs.org/lerna/-/lerna-3.16.2.tgz",
-      "integrity": "sha512-El4BJ3/h2Dw1TIMNk/30v6CXZrX85sVANMan5wmAaEGhlKwUGPV4HZLa7trFYCUSYgT4dL4pN15Vv3L48oYX/A==",
+      "version": "3.16.4",
+      "resolved": "https://registry.npmjs.org/lerna/-/lerna-3.16.4.tgz",
+      "integrity": "sha512-0HfwXIkqe72lBLZcNO9NMRfylh5Ng1l8tETgYQ260ZdHRbPuaLKE3Wqnd2YYRRkWfwPyEyZO8mZweBR+slVe1A==",
       "dev": true,
       "dev": true,
       "requires": {
       "requires": {
         "@lerna/add": "3.16.2",
         "@lerna/add": "3.16.2",
         "@lerna/bootstrap": "3.16.2",
         "@lerna/bootstrap": "3.16.2",
-        "@lerna/changed": "3.16.2",
+        "@lerna/changed": "3.16.4",
         "@lerna/clean": "3.16.0",
         "@lerna/clean": "3.16.0",
         "@lerna/cli": "3.13.0",
         "@lerna/cli": "3.13.0",
         "@lerna/create": "3.16.0",
         "@lerna/create": "3.16.0",
@@ -7336,9 +7336,9 @@
         "@lerna/init": "3.16.0",
         "@lerna/init": "3.16.0",
         "@lerna/link": "3.16.2",
         "@lerna/link": "3.16.2",
         "@lerna/list": "3.16.0",
         "@lerna/list": "3.16.0",
-        "@lerna/publish": "3.16.2",
+        "@lerna/publish": "3.16.4",
         "@lerna/run": "3.16.0",
         "@lerna/run": "3.16.0",
-        "@lerna/version": "3.16.2",
+        "@lerna/version": "3.16.4",
         "import-local": "^2.0.0",
         "import-local": "^2.0.0",
         "npmlog": "^4.1.2"
         "npmlog": "^4.1.2"
       }
       }

+ 1 - 1
package.json

@@ -77,7 +77,7 @@
     "install": "^0.9.5",
     "install": "^0.9.5",
     "jasmine-core": "2.99.1",
     "jasmine-core": "2.99.1",
     "jsdoc": "^3.6.2",
     "jsdoc": "^3.6.2",
-    "lerna": "^3.16.2",
+    "lerna": "^3.16.4",
     "lodash-template-webpack-loader": "jcbrand/lodash-template-webpack-loader",
     "lodash-template-webpack-loader": "jcbrand/lodash-template-webpack-loader",
     "mini-css-extract-plugin": "^0.7.0",
     "mini-css-extract-plugin": "^0.7.0",
     "minimist": "^1.2.0",
     "minimist": "^1.2.0",