Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
- testing framework version conflict with 5.2, disabled
  • Loading branch information
reebalazs committed Sep 22, 2023
1 parent 8725fa8 commit d1724a1
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 8 deletions.
11 changes: 7 additions & 4 deletions .github/workflows/test-plone-5.2.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Plone 5.2 testing
name: Plone 5.2 install - tests are currently not run
on:
push:
branches:
Expand All @@ -23,7 +23,9 @@ jobs:

# pin plone version (happens from make, but to be on the safe side)
- name: Pin plone 5.2
run: cp constraints-5.2.txt constraints.txt
run: |
cp constraints-5.2.txt constraints.txt
cp requirements-5.2.txt requirements.txt
# python setup
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -44,5 +46,6 @@ jobs:
run: make install-plone-5.2

# test
- name: Run tests
run: bin/test
# XXX cannot run pytests, version conflict.
# - name: Run tests
# run: bin/test
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ clean-instance: ## remove existing instance
clean-venv: ## remove virtual environment
rm -fr bin include lib lib64 env pyvenv.cfg .tox .pytest_cache requirements-mxdev.txt
cp constraints-6.0.txt constraints.txt
cp requirements-6.0.txt requirements.txt

.PHONY: clean-build
clean-build: ## remove build artifacts
Expand Down Expand Up @@ -95,6 +96,7 @@ config: bin/pip ## Create instance configuration
install-plone-6.0: bin/mxdev config ## pip install Plone packages
@echo "$(GREEN)==> Setup Build$(RESET)"
cp constraints-6.0.txt constraints.txt
cp requirements-6.0.txt requirements.txt
bin/tox -e init
bin/mxdev -c mx.ini
bin/pip install -r requirements-mxdev.txt
Expand All @@ -103,6 +105,7 @@ install-plone-6.0: bin/mxdev config ## pip install Plone packages
install-plone-5.2: bin/mxdev config ## pip install Plone packages
@echo "$(GREEN)==> Setup Build$(RESET)"
cp constraints-5.2.txt constraints.txt
cp requirements-5.2.txt requirements.txt
bin/tox -e init
bin/mxdev -c mx.ini
bin/pip install -r requirements-mxdev.txt
Expand Down
3 changes: 1 addition & 2 deletions constraints.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
-c https://dist.plone.org/release/6.0.6/constraints.txt
plone.restapi>=8.40.0
-c https://dist.plone.org/release/5.2.5/constraints.txt
4 changes: 4 additions & 0 deletions requirements-5.2.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-c constraints.txt

# Cannot install new testing framework with 5.2
# -e ".[test]"
2 changes: 2 additions & 0 deletions requirements-6.0.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-c constraints.txt
-e ".[test]"
4 changes: 3 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
-c constraints.txt
-e ".[test]"

# Cannot install new testing framework with 5.2
# -e ".[test]"
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
},
install_requires=[
"Plone>=5.2.0",
"plone.restapi>=8.21.2", # for Plone 5.2
"plone.restapi",
# "plone.restapi>=8.40.0", # for Plone 6.0
"plone.api",
"setuptools",
Expand Down

0 comments on commit d1724a1

Please sign in to comment.