Merge branch 'master' into python-3.7-to-3.10

Author: rocky

.circleci/config.yml

@@ -12,7 +12,11 @@ jobs:
       CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
       COMPILE: --compile
     docker:
+<<<<<<< HEAD
     - image: cimg/python:3.10
+=======
+    - image: cimg/python:3.13
+>>>>>>> master
     steps:
     - checkout
     - restore_cache:
@@ -21,11 +25,18 @@ jobs:
         - v1-dep-master-
         - v1-dep-
     - run: sudo apt update
+<<<<<<< HEAD
     - run: sudo apt install python3-pip
     # Until the next xdis release
     - run: sudo pip install git+https://github.com/rocky/[email protected]#egg=xdis
     - run: sudo pip install -e .
     - run: sudo pip install pytest
+=======
+      # Until the next xdis release...
+    - run: pip install git+https://github.com/rocky/python-xdis#egg=xdis
+    - run: pip install -e .
+    - run: pip install pytest
+>>>>>>> master
     - save_cache:
         key: v1-dep-{{ .Branch }}-{{ epoch }}
         paths:
@@ -46,6 +57,7 @@ jobs:
     - store_artifacts:
         path: /tmp/circleci-test-results
 
+<<<<<<< HEAD
   build-python-3-8:
     working_directory: ~/rocky/python-decompyle3
     parallelism: 1
@@ -84,6 +96,46 @@ jobs:
         path: /tmp/circleci-artifacts
     - store_artifacts:
         path: /tmp/circleci-test-results
+=======
+  # build-python-3-8:
+  #   working_directory: ~/rocky/python-decompyle3
+  #   parallelism: 1
+  #   shell: /bin/bash --login
+  #   environment:
+  #     CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
+  #     CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
+  #     COMPILE: --compile
+  #   docker:
+  #   - image: circleci/python:3.8
+  #   steps:
+  #   - checkout
+  #   - restore_cache:
+  #       keys:
+  #       - v1-dep-{{ .Branch }}-
+  #       - v1-dep-master-
+  #       - v1-dep-
+  #   - run: sudo pip install git+https://github.com/rocky/python-xdis#egg=xdis
+  #   - run: sudo pip install -e .
+  #   - run: sudo pip install pytest
+  #   - save_cache:
+  #       key: v1-dep-{{ .Branch }}-{{ epoch }}
+  #       paths:
+  #       - vendor/bundle
+  #       - ~/virtualenvs
+  #       - ~/.m2
+  #       - ~/.ivy2
+  #       - ~/.bundle
+  #       - ~/.go_workspace
+  #       - ~/.gradle
+  #       - ~/.cache/bower
+  #   - run: sudo python ./setup.py install && make check
+  #   - store_test_results:
+  #       path: /tmp/circleci-test-results
+  #   - store_artifacts:
+  #       path: /tmp/circleci-artifacts
+  #   - store_artifacts:
+  #       path: /tmp/circleci-test-results
+>>>>>>> master
 
 workflows:
   version: 2
@@ -93,7 +145,7 @@ workflows:
           filters:
             branches:
               only: master
-      - build-python-3-8:
-          filters:
-            branches:
-              only: python-3.7-to-3.10
+      # - build-python-3-8:
+      #     filters:
+      #       branches:
+      #         only: python-3.7-to-3.10

admin-tools/install-all-3.7-3.10.sh

@@ -21,8 +21,13 @@ fi
 
 cd ../dist/
 
+<<<<<<< HEAD
 install_file="python-control-flow_37-${__version__}.tar.gz"
 install_check_command="python-cfg --version"
+=======
+install_file="decompyle3_37-${__version__}.tar.gz"
+install_check_command="decompyle3 --version"
+>>>>>>> master
 for version in $PYVERSIONS; do
     echo "*** Installing ${install_file} for Python ${version} ***"
     echo $version