Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use compatible version #4977

Merged
merged 1 commit into from
Jun 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
"description": "GeoMapFish administration interface",
"author": "",
"dependencies": {
"bootstrap": "3.4.1",
"bootstrap-table": "1.14.2",
"jquery": "3.4.1",
"jquery.scrollintoview": "1.9.4",
"jstree": "3.3.8",
"jstreegrid": "3.9.5",
"magicsuggest-alpine": "1.0.0",
"openlayers": "4.6.5",
"typeahead.js": "0.11.1"
"bootstrap": "^3.4.1",
"bootstrap-table": "^1.14.2",
"jquery": "^3.4.1",
"jquery.scrollintoview": "^1.9.4",
"jstree": "^3.3.8",
"jstreegrid": "^3.9.5",
"magicsuggest-alpine": "^1.0.0",
"openlayers": "^4.6.5",
"typeahead.js": "^0.11.1"
}
}
2 changes: 1 addition & 1 deletion admin/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ c2cgeoform
c2cwsgiutils
colander
deform
iso8601==0.1.11 # deform, by default the version 0.1.12 is installed and is incompatible with deform, rq.filter: <=0.1.11
iso8601
passwordgenerator
pyproj
pyramid
Expand Down
8 changes: 4 additions & 4 deletions doc/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
alabaster==0.7.12 # Doc theme
Pygments==2.4.0 # doc
Sphinx==1.8.5 # doc, rq.filter: < 2.0.0
sphinx-prompt==1.1.0 # doc
alabaster~=0.7.12 # Doc theme
Pygments~=2.4.0 # doc
Sphinx~=1.8.5 # doc, rq.filter: < 2.0.0
sphinx-prompt~=1.1.0 # doc
24 changes: 12 additions & 12 deletions docker/qgisserver/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
c2cgeoform==2.0.dev20190513 # commons
c2cwsgiutils==2.19.2 # commons, rq.filter: <3
c2c.template==2.1.0 # geoportal
ColanderAlchemy==0.3.3 # commons
colander==1.7.0 # commons, admin
deform==2.0.7 # commons, admin
GeoAlchemy2==0.6.2 # commons, geoportal
geojson==2.4.1 # geoportal
c2cgeoform~=2.0.dev20190513 # commons
c2cwsgiutils~=2.19.2 # commons, rq.filter: <3
c2c.template~=2.1.0 # geoportal
ColanderAlchemy~=0.3.3 # commons
colander~=1.7.0 # commons, admin
deform~=2.0.7 # commons, admin
GeoAlchemy2~=0.6.2 # commons, geoportal
geojson~=2.4.1 # geoportal
iso8601==0.1.11 # deform, by default the version 0.1.12 is installed and is incompatible with deform, rq.filter: <=0.1.11
papyrus==2.4 # commons, geoportal
redis==3.2.1 # geoportal cache
SQLAlchemy==1.3.3
transaction==2.4.0 # commons, geoportal
papyrus~=2.4 # commons, geoportal
redis~=3.2.1 # geoportal cache
SQLAlchemy~=1.3.3
transaction~=2.4.0 # commons, geoportal
62 changes: 31 additions & 31 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
awscli==1.16.156 # Work with Object storage
Babel==2.7.0 # i18n
beautifulsoup4==4.6.3 # admin tests, rq.filter: <4.7
boto3==1.9.161 # Tile generation
bottle==0.12.16 # geoportal
codacy-coverage==1.3.11 # Codacy send report
coverage==4.5.3 # Build coverage XML for Codacy
flake8==3.7.7 # lint, TODO remove filter on pyflakes
flake8-copyright==0.2.2 # lint
flake8-mypy==17.8.0 # lint
glob2==0.6 # ngeo
htmlmin==0.1.12 # ngeo
Jinja2==2.10.1 # c2c.template
lingua==4.13 # i18n
mccabe==0.6.1 # lint
mypy==0.701 # lint
pep8==1.7.1 # lint
pep8-naming==0.8.2 # Lint
polib==1.1.0 # i18n
pyflakes==2.1.1 # lint, flake8
pylint==2.3.1 # lint
Pillow==5.4.1 # Tile generation, rq.filter: < 6.0.0
pytest-cov==2.7.1 # tests
pytest-selenium==1.16.0 # admin tests
six==1.11.0 # required by transifex, rq.filter: ==1.11.0
tilecloud==1.3.1 # Tile generation
tilecloud-chain==1.11.1 # Tile generation
transifex-client==0.13.6 # Makefile
awscli~=1.16.156 # Work with Object storage
Babel~=2.7.0 # i18n
beautifulsoup4~=4.6.3 # admin tests, rq.filter: <4.7
boto3~=1.9.161 # Tile generation
bottle~=0.12.16 # geoportal
codacy-coverage~=1.3.11 # Codacy send report
coverage~=4.5.3 # Build coverage XML for Codacy
flake8~=3.7.7 # lint, TODO remove filter on pyflakes
flake8-copyright~=0.2.2 # lint
flake8-mypy~=17.8.0 # lint
glob2~=0.6 # ngeo
htmlmin~=0.1.12 # ngeo
Jinja2~=2.10.1 # c2c.template
lingua~=4.13 # i18n
mccabe~=0.6.1 # lint
mypy~=0.701 # lint
pep8~=1.7.1 # lint
pep8-naming~=0.8.2 # Lint
polib~=1.1.0 # i18n
pyflakes~=2.1.1 # lint, flake8
pylint~=2.3.1 # lint
Pillow~=5.4.1 # Tile generation, rq.filter: < 6.0.0
pytest-cov~=2.7.1 # tests
pytest-selenium~=1.16.0 # admin tests
six~=1.11.0 # required by transifex, rq.filter: ==1.11.0
tilecloud~=1.3.1 # Tile generation
tilecloud-chain~=1.11.1 # Tile generation
transifex-client~=0.13.6 # Makefile
urllib3==1.23 # required by transifex, rq.filter: <1.24
waitress==1.3.0 # pcreate
WebOb==1.8.5 # geoportal test
WebTest==2.0.33 # admin tests
waitress~=1.3.0 # pcreate
WebOb~=1.8.5 # geoportal test
WebTest~=2.0.33 # admin tests
82 changes: 41 additions & 41 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
alembic==1.0.10 # geoportal
c2c.template==2.1.0 # geoportal
c2cgeoform==2.0.dev20190513 # commons
colander==1.7.0 # commons, admin
ColanderAlchemy==0.3.3 # commons
dateutils==0.6.6 # geoportal pcreate
deform==2.0.7 # commons, admin
defusedxml==0.6.0 # geoportal
dogpile.cache==0.7.1 # geoportal
Fiona==1.8.6 # geoportal raster
GeoAlchemy2==0.6.2 # commons, geoportal
geojson==2.4.1 # geoportal
ipcalc==1.99.0 # geoportal
alembic~=1.0.10 # geoportal
c2c.template~=2.1.0 # geoportal
c2cgeoform~=2.0.dev20190513 # commons
colander~=1.7.0 # commons, admin
ColanderAlchemy~=0.3.3 # commons
dateutils~=0.6.6 # geoportal pcreate
deform~=2.0.7 # commons, admin
defusedxml~=0.6.0 # geoportal
dogpile.cache~=0.7.1 # geoportal
Fiona~=1.8.6 # geoportal raster
GeoAlchemy2~=0.6.2 # commons, geoportal
geojson~=2.4.1 # geoportal
ipcalc~=1.99.0 # geoportal
iso8601==0.1.11 # deform, by default the version 0.1.12 is installed and is incompatible with deform, rq.filter: <=0.1.11
isodate==0.6.0 # geoportal
Mako==1.0.10 # geoportal
OWSLib==0.17.1 # geoportal
papyrus==2.4 # commons, geoportal
isodate~=0.6.0 # geoportal
Mako~=1.0.10 # geoportal
OWSLib~=0.17.1 # geoportal
papyrus~=2.4 # commons, geoportal
passwordgenerator # geoportal
PasteScript==3.1.0 # geoportal pcreate
psycopg2-binary==2.8.2 # geoportal
pycryptodome==3.8.1 # geoportal
pykwalify==1.7.0 # geoportal build
Pympler==0.7 # geoportal, memory view
pyproj==1.9.6 # admin, other?, rq.filter: < 2.0.0
pyramid==1.10.4 # geoportal
pyramid_debugtoolbar==4.5 # geoportal
pyramid-jinja2==2.8 # admin
pyramid_mako==1.0.2 # geoportal
pyramid_multiauth==0.9.0 # geoportal
pyramid_tm==2.2.1 # geoportal
python-dateutil==2.8.0 # geoportal, rq.filter: <2.7.0
PyYAML==5.1 # geoportal
rasterio==1.0.2 # geoportal raster, rq.filter: <=1.0.2
requests==2.22.0 # geoportal
redis==3.2.1 # geoportal cache
Shapely==1.6.4.post2 # geoportal
simplejson==3.16.0 # geoportal, rq.filter: !=3.16.1
SQLAlchemy==1.3.4
transaction==2.4.0 # commons, geoportal
translationstring==1.3 # admin
wsgi-lineprof==0.7.0 # profiling
zope.event==4.4 # commons, geoportal
PasteScript~=3.1.0 # geoportal pcreate
psycopg2-binary~=2.8.2 # geoportal
pycryptodome~=3.8.1 # geoportal
pykwalify~=1.7.0 # geoportal build
Pympler~=0.7 # geoportal, memory view
pyproj~=1.9.6 # admin, other?, rq.filter: < 2.0.0
pyramid~=1.10.4 # geoportal
pyramid_debugtoolbar~=4.5 # geoportal
pyramid-jinja2~=2.8 # admin
pyramid_mako~=1.0.2 # geoportal
pyramid_multiauth~=0.9.0 # geoportal
pyramid_tm~=2.2.1 # geoportal
python-dateutil~=2.8.0 # geoportal
PyYAML~=5.1 # geoportal
rasterio~=1.0.2 # geoportal raster, rq.filter: <=1.0.2
requests~=2.22.0 # geoportal
redis~=3.2.1 # geoportal cache
Shapely~=1.6.4.post2 # geoportal
simplejson~=3.16.0 # geoportal, rq.filter: !=3.16.1
SQLAlchemy~=1.3.4
transaction~=2.4.0 # commons, geoportal
translationstring~=1.3 # admin
wsgi-lineprof~=0.7.0 # profiling
zope.event~=4.4 # commons, geoportal