Skip to content

Commit

Permalink
in pyyaml, try to fix incompatibility with cython
Browse files Browse the repository at this point in the history
  • Loading branch information
northdpole committed Jul 6, 2024
1 parent addc315 commit d6394fb
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 30 deletions.
21 changes: 14 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,22 @@ jobs:
steps:
- name: Check out code
uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.11.4'
cache: 'pip'
python-version: '3.12.3'
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y \
python3-setuptools \
python3-virtualenv \
python3-pip \
libxml2-dev \
libxslt-dev
- name: Install python dependencies
run: |
sudo apt-get update
sudo apt-get install -y python3-setuptools python3-virtualenv python3-pip
pip install --upgrade pip
make install-python
pip install --upgrade pip
pip install --upgrade setuptools
make install-python
- name: Test
run: make test
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ install-deps-typescript:
install-deps: install-deps-python install-deps-typescript

install-python:
virtualenv -p python3 venv
virtualenv -p python3 --system-site-packages venv
. ./venv/bin/activate &&\
make install-deps-python &&\
playwright install
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
from application.defs import cre_defs as defs
import urllib
import re
from simplify_docx import simplify
import docx
import tempfile
from application.prompt_client import prompt_client as prompt_client
from application.utils.external_project_parsers.base_parser_defs import (
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"sass-loader": "^11.0.1",
"style-loader": "2.0.0",
"ts-jest": "^26.5.5",
"webpack": "^5.91.0",
"webpack": "^5.92.1",
"webpack-cli": "^4.4.0",
"webpack-dev-server": "^3.11.2"
},
Expand Down
6 changes: 1 addition & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ black==24.4.2 # do not touch, same version as superlinter
compliance-trestle
coverage
dacite
docx
Flask
Flask_Caching
flask_compress
Expand Down Expand Up @@ -30,7 +29,6 @@ scikit_learn
scipy
semver
setuptools
simplify_docx
SQLAlchemy
compliance-trestle
nose
Expand Down Expand Up @@ -75,12 +73,11 @@ pytest
pytest-base-url
pytest-playwright
python-dateutil
python-docx
python-dotenv
python-frontmatter
python-markdown-maker
python-slugify
PyYAML
PyYAML==6.0.1
regex
requests
requests-oauthlib
Expand All @@ -92,7 +89,6 @@ ruamel.yaml
ruamel.yaml.clib
scikit-learn
Shapely
simplify-docx
six
smmap
sniffio
Expand Down
28 changes: 14 additions & 14 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3301,10 +3301,10 @@ acorn-import-assertions@^1.7.6:
resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==

acorn-import-assertions@^1.9.0:
version "1.9.0"
resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac"
integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==
acorn-import-attributes@^1.9.5:
version "1.9.5"
resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef"
integrity sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==

acorn-jsx@^5.3.1, acorn-jsx@^5.3.2:
version "5.3.2"
Expand Down Expand Up @@ -7153,10 +7153,10 @@ enhanced-resolve@^5.10.0:
graceful-fs "^4.2.4"
tapable "^2.2.0"

enhanced-resolve@^5.16.0:
version "5.16.1"
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.16.1.tgz#e8bc63d51b826d6f1cbc0a150ecb5a8b0c62e567"
integrity sha512-4U5pNsuDl0EhuZpq46M5xPslstkviJuhrdobaRDBk2Jy2KO37FDAJl4lb2KlNabxT0m4MTK2UHNrsAcphE8nyw==
enhanced-resolve@^5.17.0:
version "5.17.0"
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz#d037603789dd9555b89aaec7eb78845c49089bc5"
integrity sha512-dwDPwZL0dmye8Txp2gzFmA6sxALaSvdRDjPH0viLcKrtlOL3tw62nWWweVD1SdILDTJrbrL6tdWVN58Wo6U3eA==
dependencies:
graceful-fs "^4.2.4"
tapable "^2.2.0"
Expand Down Expand Up @@ -17413,21 +17413,21 @@ webpack@^5.64.4:
watchpack "^2.4.0"
webpack-sources "^3.2.3"

webpack@^5.91.0:
version "5.91.0"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.91.0.tgz#ffa92c1c618d18c878f06892bbdc3373c71a01d9"
integrity sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==
webpack@^5.92.1:
version "5.92.1"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.92.1.tgz#eca5c1725b9e189cffbd86e8b6c3c7400efc5788"
integrity sha512-JECQ7IwJb+7fgUFBlrJzbyu3GEuNBcdqr1LD7IbSzwkSmIevTm8PF+wej3Oxuz/JFBUZ6O1o43zsPkwm1C4TmA==
dependencies:
"@types/eslint-scope" "^3.7.3"
"@types/estree" "^1.0.5"
"@webassemblyjs/ast" "^1.12.1"
"@webassemblyjs/wasm-edit" "^1.12.1"
"@webassemblyjs/wasm-parser" "^1.12.1"
acorn "^8.7.1"
acorn-import-assertions "^1.9.0"
acorn-import-attributes "^1.9.5"
browserslist "^4.21.10"
chrome-trace-event "^1.0.2"
enhanced-resolve "^5.16.0"
enhanced-resolve "^5.17.0"
es-module-lexer "^1.2.1"
eslint-scope "5.1.1"
events "^3.2.0"
Expand Down

0 comments on commit d6394fb

Please sign in to comment.