diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 88295d5930..39bc0f7bee 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,12 +26,12 @@ jobs: uses: actions/cache@v2 with: path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('dev.txt', 'docs.txt', 'prod.txt' 'test.txt') }} + key: ${{ runner.os }}-pip-${{ hashFiles('dev.txt', 'docs.txt', 'prod.txt', 'test.txt') }} restore-keys: | ${{ runner.os }}-pip- ${{ runner.os }}- - name: Install Ralph's python dependencies - run: pip3 install -r "${GITHUB_WORKSPACE}/requirements/code_style.txt" + run: pip3 install -r "${GITHUB_WORKSPACE}/requirements/dev.txt" - name: Run flake8 run: make flake @@ -105,7 +105,7 @@ jobs: uses: actions/cache@v2 with: path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('dev.txt', 'docs.txt', 'prod.txt' 'test.txt') }} + key: ${{ runner.os }}-pip-${{ hashFiles('dev.txt', 'docs.txt', 'prod.txt', 'test.txt') }} restore-keys: | ${{ runner.os }}-pip- ${{ runner.os }}- @@ -154,7 +154,7 @@ jobs: uses: actions/cache@v2 with: path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('dev.txt', 'docs.txt', 'prod.txt' 'test.txt') }} + key: ${{ runner.os }}-pip-${{ hashFiles('dev.txt', 'docs.txt', 'prod.txt', 'test.txt') }} restore-keys: | ${{ runner.os }}-pip- ${{ runner.os }}- @@ -162,7 +162,6 @@ jobs: - name: Install Ralph's python dependencies run: | pip3 install -r "${GITHUB_WORKSPACE}/requirements/test.txt" - pip3 install -r "${GITHUB_WORKSPACE}/requirements/openstack.txt" - name: Test Ralph's settings run: ./scripts/test_settings.sh prod test >/dev/null @@ -255,7 +254,6 @@ jobs: - name: Install Ralph's python dependencies run: | pip3 install -r "${GITHUB_WORKSPACE}/requirements/test.txt" - pip3 install -r "${GITHUB_WORKSPACE}/requirements/openstack.txt" - name: Install PostgreSQL driver if: ${{ matrix.db-engine == 'psql' }} diff --git a/mise.toml b/mise.toml index a9ecb3a6aa..2606da3129 100644 --- a/mise.toml +++ b/mise.toml @@ -1,7 +1,5 @@ [env] _.python.venv = ".venv" -LDFLAGS = "-L/opt/homebrew/opt/openssl/lib" -CPPFLAGS = "-I/opt/homebrew/opt/openssl/include" DJANGO_SETTINGS_MODULE = "ralph.settings.local" TEST_DB_ENGINE = "psql" DATABASE_PORT = 54320 @@ -26,6 +24,7 @@ run = [ "make menu", ] description = "Bootstrap new local ralph installation" +alias = "i" [tasks.up] run = "docker-cli-plugin-docker-compose -f docker/docker-compose-dev.yml up -d" @@ -44,7 +43,6 @@ run = [ "uv pip compile pyproject.toml --extra dev --extra test -o requirements/test.txt", "uv pip compile pyproject.toml --extra prod -o requirements/prod.txt", ] -alias = "i" description = "Compile requirements" [tasks.lint] diff --git a/pyproject.toml b/pyproject.toml index 2fa762b30a..15ed89b040 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,7 +11,7 @@ omit = "*migrations*,*tests*,*__init__*,*wsgi.py,*__main__*,*settings*,*manage.p [project] name = "Ralph" version = "20241127.1" -requires-python = ">=3.8" +requires-python = "==3.8.19" dynamic = [ "scripts", "entry-points", diff --git a/requirements/code_style.txt b/requirements/code_style.txt deleted file mode 100644 index 4e603cdb68..0000000000 --- a/requirements/code_style.txt +++ /dev/null @@ -1,3 +0,0 @@ -flake8==3.7.9 -isort==4.2.5 -pyflakes==2.1.0