Skip to content

Commit

Permalink
Merge branch 'master' into erral-issue-37
Browse files Browse the repository at this point in the history
  • Loading branch information
wesleybl authored Mar 11, 2024
2 parents b11d294 + f7d359e commit c9e5cb5
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 85 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.8, 3.7]
python-version: [3.8]
plone-version: [5.2]

steps:
Expand All @@ -30,7 +30,7 @@ jobs:
# Firefox
- uses: browser-actions/setup-firefox@latest
with:
firefox-version: '89.0'
firefox-version: '102.6.0esr'
- run: firefox --version

# python install
Expand Down
5 changes: 4 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
Changelog
=========

2.0.2 (unreleased)
3.0.0 (unreleased)
------------------

- Fix JSON call URL in non-rooted virtual host environments. Fixes #37
[erral]

- Drop support to Python 3.7.
[wesleybl]


2.0.1 (2021-09-16)
------------------
Expand Down
8 changes: 0 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,6 @@ all: .installed.cfg
help: ## This help message
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

.PHONY: Update Makefile and Buildout
update: ## Update Make and Buildout
wget -O Makefile https://raw.githubusercontent.com/kitconcept/buildout/5.2/Makefile
wget -O requirements.txt https://raw.githubusercontent.com/kitconcept/buildout/5.2/requirements.txt
wget -O plone-5.2.x.cfg https://raw.githubusercontent.com/kitconcept/buildout/5.2/plone-5.2.x.cfg
wget -O ci.cfg https://raw.githubusercontent.com/kitconcept/buildout/5.2/ci.cfg
wget -O versions.cfg https://raw.githubusercontent.com/kitconcept/buildout/5.2/versions.cfg

.installed.cfg: bin/buildout *.cfg
bin/buildout

Expand Down
17 changes: 1 addition & 16 deletions plone-5.2.x.cfg
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
[buildout]
extends =
https://dist.plone.org/release/5.2.5/versions.cfg
https://dist.plone.org/release/5.2.14/versions.cfg
base.cfg
find-links += https://dist.plone.org/thirdparty/
versions=versions

[versions]
black = 21.7b0

# Error: The requirement ('virtualenv>=20.0.35') is not allowed by your [versions] constraint (20.0.26)
virtualenv = 20.0.35

# Error: The requirement ('importlib-metadata>=1') is not allowed by your [versions] constraint (0.23)
importlib-metadata = 2.0.0

# cffi 1.14.3 fails on apple m1
# cffi 1.14.4 fails with "ModuleNotFoundError: No module named '_cffi_backend'"
cffi = 1.14.6
1 change: 1 addition & 0 deletions requirements-5.2.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-r https://dist.plone.org/release/5.2.14/requirements.txt
5 changes: 1 addition & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
# Keep this file in sync with: https://github.com/kitconcept/buildout/edit/master/requirements.txt
setuptools==42.0.2
zc.buildout==2.13.3
wheel
-r requirements-5.2.txt
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from setuptools import setup


version = '2.0.2.dev0'
version = '3.0.0.dev0'

long_description = '\n\n'.join([
open('README.rst').read(),
Expand All @@ -28,7 +28,6 @@
'Operating System :: OS Independent',
'Programming Language :: JavaScript',
'Programming Language :: Python',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Topic :: Software Development :: Libraries :: Python Modules',
'Topic :: Software Development :: Widget Sets',
Expand Down
52 changes: 0 additions & 52 deletions versions.cfg

This file was deleted.

0 comments on commit c9e5cb5

Please sign in to comment.