Merge pull request #18 from rocky/add-pyproject.toml

Add rudimentary pytoml setup and ...

Author: rocky

.circleci/config.yml

@@ -1,69 +1,36 @@
-version: 2
+version: 2.1
 jobs:
   build:
     working_directory: ~/rocky/python-spark
     parallelism: 1
-    shell: /bin/bash --login
-    # CircleCI 2.0 does not support environment variables that refer to each other the same way as 1.0 did.
-    # If any of these refer to each other, rewrite them so that they don't or see https://circleci.com/docs/2.0/env-vars/#interpolating-environment-variables-to-set-other-environment-variables .
-    environment:
-      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
-      CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
-      COMPILE: --compile
-    # In CircleCI 1.0 we used a pre-configured image with a large number of languages and other packages.
-    # In CircleCI 2.0 you can now specify your own image, or use one of our pre-configured images.
-    # The following configuration line tells CircleCI to use the specified docker image as the runtime environment for you job.
-    # We have selected a pre-built image that mirrors the build environment we use on
-    # the 1.0 platform, but we recommend you choose an image more tailored to the needs
-    # of each job. For more information on choosing an image (or alternatively using a
-    # VM instead of a container) see https://circleci.com/docs/2.0/executor-types/
-    # To see the list of pre-built images that CircleCI provides for most common languages see
-    # https://circleci.com/docs/2.0/circleci-images/
     docker:
-    - image: circleci/python:3.7.4
-    steps:
-    # Machine Setup
-    #   If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
-    # The following `checkout` command checks out your code to your working directory. In 1.0 we did this implicitly. In 2.0 you can choose where in the course of a job your code should be checked out.
-    - checkout
-    # Dependencies
-    #   This would typically go in either a build or a build-and-test job when using workflows
-    # Restore the dependency cache
-    - restore_cache:
-        keys:
-          - v2-dependencies-{{ .Branch }}-
-          # fallback to using the latest cache if no exact match is found
-          - v2-dependencies-
+    - image: cimg/python:3.12
 
-    # This is based on your 1.0 configuration file or project settings
-    - run: pip install --upgrade setuptools
-    - run: pip install -e .
-    - run: pip install -r requirements-dev.txt
+    steps:
+      # Checkout the code as the first step.
+      - checkout
+      - run: pip install --upgrade setuptools
+      - run: pip install -e .[dev]
+      - run: make check
 
-    # Save dependency cache
-    - save_cache:
-        key: v2-dependencies-{{ .Branch }}-{{ epoch }}
-        paths:
-        # This is a broad list of cache paths to include many possible development environments
-        # You can probably delete some of these entries
-        - vendor/bundle
-        - ~/virtualenvs
-        - ~/.m2
-        - ~/.ivy2
-        - ~/.bundle
-        - ~/.cache/bower
+      - restore_cache:
+          keys:
+            # This branch if available
+            - v2-dependencies-{{ .Branch }}-
+            # Default branch if not
+            - v2-dependencies-master-
+            # Any branch if there are none on the default branch - this should be unnecessary if you have your default branch configured correctly
+            - v2-dependencies-
 
-    # Test
-    #   This would typically be a build job when using workflows, possibly combined with build
-    # This is based on your 1.0 configuration file or project settings
-    - run: python ./setup.py develop && make check
-    # Teardown
-    #   If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
-    # Save test results
-    - store_test_results:
-        path: /tmp/circleci-test-results
-    # Save artifacts
-    - store_artifacts:
-        path: /tmp/circleci-artifacts
-    - store_artifacts:
-        path: /tmp/circleci-test-results
+      # Save dependency cache
+      - save_cache:
+          key: v2-dependencies-{{ .Branch }}-{{ epoch }}
+          paths:
+          # This is a broad list of cache paths to include many possible development environments
+          # You can probably delete some of these entries
+          - vendor/bundle
+          - ~/virtualenvs
+          - ~/.m2
+          - ~/.ivy2
+          - ~/.bundle
+          - ~/.cache/bower

LICENSE

@@ -1,6 +1,6 @@
 Copyright (c) 1998-2002 John Aycock
 Copyright (c) 2000 by hartmut Goebel <h.goebel@crazy-compilers.com>
-Copyright (c) 2015 by Rocky Bernstein
+Copyright (c) 2015, 2024 by Rocky Bernstein
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the

Makefile

@@ -17,13 +17,13 @@ all: check
 check-full: check
 	flake8 spark_parser && flake8 test \
 	&& flake8 example \
-	--exclude example/python2/test \
+	--exclude spark_parser/example/python2/test \
 
 #: Run tests (one version of Python)
 check:
 	$(PYTHON3) -m pytest $(PYTEST_OPTIONS) test
-	$(MAKE) -C example/python2 check
-#	$(MAKE) -C example/gdb-loc check
+	$(MAKE) -C spark_parser/example/python2 check
+#	$(MAKE) -C spark_parser/example/gdb-loc check
 
 CLEAN_FILES= *.pyc *.so */*.pyc __pycache__ rm  */__pycache__/ */*/__pycache__ *~ */*~
 #: Clean up temporary files