diff --git a/.github/workflows/vul-test.yml b/.github/workflows/vul-test.yml index d108c8e..e9ebafa 100644 --- a/.github/workflows/vul-test.yml +++ b/.github/workflows/vul-test.yml @@ -56,13 +56,13 @@ jobs: - name: Run Vul test run: | - curl --fail --retry-delay 10 --retry 30 --retry-connrefused http://127.0.0.1:8003/api/django/demo/get_open?name=Data cd ${{ github.workspace }}/DockerVulspace + curl --fail --retry-delay 10 --retry 30 --retry-connrefused http://127.0.0.1:8003/api/django/demo/get_open?name=Data + docker-compose logs djangoweb flaskweb docker-compose exec -T djangoweb python -V docker-compose exec -T djangoweb pip list docker-compose exec -T flaskweb python -V docker-compose exec -T flaskweb pip list - docker-compose logs djangoweb flaskweb bash ${{ github.workspace }}/DongTai-agent-python/dongtai_agent_python/tests/vul-test.sh \ django http://127.0.0.1:8003/api/django ${{ github.run_id }} bash ${{ github.workspace }}/DongTai-agent-python/dongtai_agent_python/tests/vul-test.sh \ diff --git a/dongtai_agent_python/utils/shm/shm.py b/dongtai_agent_python/utils/shm/shm.py index d0c8a3b..dad82ba 100644 --- a/dongtai_agent_python/utils/shm/shm.py +++ b/dongtai_agent_python/utils/shm/shm.py @@ -6,7 +6,7 @@ from dongtai_agent_python.utils.lock import lock -if sys.version_info[:3] <= (3, 7): +if sys.version_info[:3] < (3, 8): from shared_memory.shared_memory import SharedMemory else: from multiprocessing.shared_memory import SharedMemory diff --git a/setup.cfg b/setup.cfg index 1784c82..e8d331e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -29,5 +29,5 @@ install_requires = psutil >= 5.8.0 requests >= 2.25.1 pip >= 19.2.3 - shared-memory38 >= 0.1.2; python_version <= '3.7' + shared-memory38 >= 0.1.2; python_version < '3.8' ; regexploit >= 1.0.0