initial build/test steps for nodejs

.circleci/config.yml

@@ -13,40 +13,32 @@ executors:
   nodejs:
     docker:
       - image: node:18
-    resource_class: medium
+    resource_class: small
 
 
 jobs:
   python-test:
     executor: python
-    working_directory: ~/scwrypts/py/lib
+    working_directory: ./py/lib
     steps:
-      - checkout:
-          path: ~/scwrypts
-      - run:
-          name: pytest
-          command: |
-            : \
-              && pip install . .[test] \
-              && pytest \
-              ;
-      - run: pip install build && python -m build
+      - run: |
+          : \
+            && pip install -e . \
+            && pytest \
+            ;
 
   python-publish:
     executor: python
-    working_directory: ~/scwrypts/py/lib
     steps:
-      - checkout:
-          path: ~/scwrypts
-      - run: pip install build && python -m build
+      - checkout
+      - python/dist
       - run: pip install twine && twine upload dist/*
 
-  nodejs-test:
+  nodesjs-test:
     executor: nodejs
-    working_directory: ~/scwrypts/zx/lib
+    working_directory: ./zx/lib
     steps:
-      - checkout:
-          path: ~/scwrypts
+      - checkout
 
       - restore_cache:
           name: restore pnpm cache
@@ -69,14 +61,12 @@ jobs:
 
       - run: pnpm test
       - run: pnpm lint
-      - run: pnpm build
 
-  nodejs-publish:
+  nodesjs-publish:
     executor: nodejs
-    working_directory: ~/scwrypts/zx/lib
+    working_directory: ./zx/lib
     steps:
-      - checkout:
-          path: ~/scwrypts
+      - checkout
 
       - restore_cache:
           name: restore pnpm cache
@@ -97,62 +87,23 @@ jobs:
           paths:
             - .pnpm-store
 
-      - run:
-          name: publish
-          command: |
-            : \
-              && [ $CIRCLE_TAG ] \
-              && pnpm build \
-              && pnpm version $CIRCLE_TAG \
-              && pnpm set //registry.npmjs.org/:_authToken=$NPM_TOKEN \
-              && pnpm publish --no-git-checks \
-              ;
+      - run: pnpm build
+      - run: pnpm version $(git describe --tags)
+
 
 workflows:
-  python-dev:
+  build:
     jobs:
-      - python-test:
-          filters:
-            branches:
-              ignore: /^main$/
-
-  python:
-    jobs:
-      - python-test:
-          filters:
-            tags:
-              only: /^v\d+\.\d+\.\d+.*$/
-            branches:
-              ignore: /^.*$/
+      - python-test
       - python-publish:
           requires: [python-test]
-          context: [pypi-yage]
           filters:
-            tags:
-              only: /^v\d+\.\d+\.\d+.*$/
             branches:
-              ignore: /^.*$/
+              only: main
 
-  nodejs-dev:
-    jobs:
-      - nodejs-test:
-          filters:
-            branches:
-              ignore: /^main$/
-
-  nodejs:
-    jobs:
-      - nodejs-test:
-          filters:
-            tags:
-              only: /^v\d+\.\d+\.\d+.*$/
-            branches:
-              ignore: /^.*$/
+      - nodejs-test
       - nodejs-publish:
           requires: [nodejs-test]
-          context: [npm-wrynegade]
           filters:
-            tags:
-              only: /^v\d+\.\d+\.\d+.*$/
             branches:
-              ignore: /^.*$/
+              only: main

py/lib/.gitignore

@@ -1,4 +1 @@
 dist/
-__pycache__/
-*.py[cod]
-*.so

py/lib/pyproject.toml

@@ -55,5 +55,6 @@ source = 'versioningit'
 [tool.hatch.build.targets.wheel]
 packages = ['./']
 
-[tool.versioningit.vcs]
-match = ['v[0-9]*.[0-9]*.[0-9]*']
+[tool.versioningit]
+match = ['v*']
+

py/lib/scwrypts/scwrypts/scwrypts.py

@@ -41,7 +41,7 @@ def scwrypts(*args, patterns=None, name=None, group=None, _type=None, log_level=
         depth = int(depth) + 1
 
     return run(
-        f'SUBSCWRYPT={depth} {executable} {" ".join(pre_args)} -- {" ".join(args)}',
+        f'SUBSCWRYPT={depth} {executable} {pre_args} -- {" ".join(args)}',
         shell=True,
         executable='/bin/zsh',
         check=False,

zx/lib/package.json

@@ -26,7 +26,6 @@
 		"prettier": "^3.2.5",
 		"ts-jest": "^29.1.2",
 		"ts-node": "^10.9.2",
-		"typescript": "^5.3.3",
 		"uuid": "^9.0.1"
 	},
 	"eslintConfig": {

zx/lib/pnpm-lock.yaml

@@ -43,9 +43,6 @@ devDependencies:
   ts-node:
     specifier: ^10.9.2
     version: 10.9.2(@types/node@20.11.19)(typescript@5.3.3)
-  typescript:
-    specifier: ^5.3.3
-    version: 5.3.3
   uuid:
     specifier: ^9.0.1
     version: 9.0.1

zx/lib/src/scwrypts/scwrypts.test.ts

@@ -64,9 +64,11 @@ afterEach(() => {
 });
 
 describe('exact lookup', () => {
+  let output;
   beforeEach(async () => {
     sample.spy.getScwryptsLookup.mockReturnValue(sample.lookup.exact);
-    await scwrypts(sample.options);
+
+    output = await scwrypts(sample.options);
   });
 
   test('gets the correct lookup', () => {
@@ -96,6 +98,7 @@ describe('exact lookup', () => {
 describe('patterns lookup', () => {
   beforeEach(async () => {
     sample.spy.getScwryptsLookup.mockReturnValue(sample.lookup.patterns);
+
     await scwrypts(sample.options);
   });