Skip to content

Commit

Permalink
Adapt CI
Browse files Browse the repository at this point in the history
  • Loading branch information
duchenean committed Feb 1, 2024
1 parent 2633d4d commit bb17af1
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
continue-on-error: ${{ matrix.experimental }}
matrix:
python-version: [3.8]
plone-version: [5.2]
plone-version: [52]
experimental: [false]
include:
- python-version: 3.11
Expand Down
8 changes: 1 addition & 7 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,10 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.8, 3.9]
python-version: [3.8]
plone-version: [5.2]
experimental: [false]
include:
- python-version: 3.8
plone-version: "6.0"
experimental: true
- python-version: 3.9
plone-version: "6.0"
experimental: true
- python-version: "3.10"
plone-version: "6.0"
experimental: true
Expand Down
4 changes: 2 additions & 2 deletions actions/buildout/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ runs:
- name: Install dependencies
run: |
pip install -U pip setuptools coveralls coverage mockito pre-commit
pip install -r https://dist.plone.org/release/${{ inputs.plone-version }}-latest/requirements.txt
pip install -r requirements-${{ inputs.plone-version }}.txt
shell: bash
- name: buildout
run: |
buildout -c test_plone${{ inputs.plone-version }}.cfg buildout:download-cache=./buildout-cache/downloads buildout:eggs-directory=./buildout-cache/eggs
buildout -c test-${{ inputs.plone-version }}.cfg buildout:download-cache=./buildout-cache/downloads buildout:eggs-directory=./buildout-cache/eggs
shell: bash
11 changes: 11 additions & 0 deletions requirements-5.2.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
setuptools==65.7.0
zc.buildout==3.0.1
wheel==0.38.4

# Windows specific down here (has to be installed here, fails in buildout)
# Dependency of zope.sendmail:
pywin32 ; platform_system == 'Windows'
# SSL Certs on Windows, because Python is missing them otherwise:
certifi ; platform_system == 'Windows'
# Dependency of collective.recipe.omelette:
ntfsutils ; platform_system == 'Windows' and python_version < '3.0'
16 changes: 16 additions & 0 deletions requirements-6.0.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
pip==23.3.1
setuptools==69.0.2
wheel==0.42.0
zc.buildout==3.0.1

# Windows specific down here (has to be installed here, fails in buildout)
# Dependency of zope.sendmail:
pywin32 ; platform_system == 'Windows'

# SSL Certs on windows, because Python is missing them otherwise:
certifi ; platform_system == 'Windows'

# VSCode robotframework-lsp requires robotframework directly in venv
robotframework==6.0.2
# robotframework >= 6.1 is only supported with robotframwork-lsp >= 1.11.0,
# but https://github.com/robocorp/robotframework-lsp/issues/947
11 changes: 11 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
setuptools==65.7.0
zc.buildout==3.0.1
wheel==0.38.4

# Windows specific down here (has to be installed here, fails in buildout)
# Dependency of zope.sendmail:
pywin32 ; platform_system == 'Windows'
# SSL Certs on Windows, because Python is missing them otherwise:
certifi ; platform_system == 'Windows'
# Dependency of collective.recipe.omelette:
ntfsutils ; platform_system == 'Windows' and python_version < '3.0'
File renamed without changes.
File renamed without changes.

0 comments on commit bb17af1

Please sign in to comment.