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.

Sign up for GitHub

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

Jump to bottom

Project structure #3174

Merged
merged 4 commits into from
Oct 17, 2017
Merged

Project structure #3174

merged 4 commits into from
Oct 17, 2017

Conversation

sbrunner
Copy link
Member

No description provided.

@sbrunner sbrunner added this to the 2.3 milestone Oct 16, 2017
@sbrunner sbrunner force-pushed the project-structure branch 5 times, most recently from 19fc9c4 to 4fa2d42 Compare October 17, 2017 08:42
ger-benjamin
ger-benjamin reviewed Oct 17, 2017
View reviewed changes
Copy link
Member

@ger-benjamin ger-benjamin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work 👍

Makefile Outdated
tx push --source --force --no-interactive
tx push --translations --force --no-interactive
tx push --source --resource=geomapfish.c2cgeoportal_geoportal-$(TX_VERSION)
tx push --source --resource=geomapfish.c2cgeoportal_admin-$(TX_VERSION)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No --force --no-interactive ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oups missing :-)

commons/setup.py Outdated
author="Camptocamp",
author_email="info@camptocamp.com",
url="http://www.camptocamp.com/geospatial-solutions",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://www.camptocamp.com/solutions/geospatial/ is better no ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes :-)

doc/integrator/make.rst Outdated
* ``PRINT``: Mapfish print is enable, defaults to ``TRUE``.
* ``MAPSERVER``: Mapserver is enable, defaults to ``TRUE``.
* ``TILECLOUD_CHAIN``: ``TRUE`` to indicate that we use TileCloud-chain, defaults to ``TRUE``.
* ``VISIBLE_ENTRY_POINT``: The entry point (path) of the application, defaults to ``/``.
* ``VISIBLE_WEB_HOST``: The hostname, required.
* ``VISIBLE_WEB_PROTOCOL``: The used protocole, defaults to ``https``.
* ``VISIBLE_WEB_PROTOCOL``: The used protocol, defaults to ``https``.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/defaults/default

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks :-)

docker/build/requirements.txt Outdated
@@ -4,48 +4,51 @@ Babel==2.5.1
boto==2.48.0
bottle==0.12.13
c2c.cssmin==0.7.dev6 # MakeFile
c2c.template==1.5.1 # setup.py
c2c.template==1.5.1 # geoportal
http://github.com/camptocamp/c2cgeoform/archive/87a4191ef3330b76497bd009e9c0220cbc73c625.zip#egg=c2cgeoform # commons
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

geoportal/c2cgeoportal_geoportal/lib/lingua_extractor.py
enums = []
enum_layers = config["vars"].get("layers", {}).get("enum", {})
for layername in list(enum_layers.keys()):
layerinfos = enum_layers.get(layername, {})
attributes = layerinfos.get("attributes", {})
for fieldname in list(attributes.keys()):
values = cls._enumerate_attributes_values(DBSessions, Layers, layerinfos, fieldname)
values = cls._enumerate_attributes_values(models.DBSessions, Layers, layerinfos, fieldname)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes :-)

geoportal/c2cgeoportal_geoportal/scaffolds/create/geoportal/setup.py_tmpl Outdated
description='{{package}}, a c2cgeoportal project',
author='camptocamp',
author_email='info@camptocamp.com',
url='http://www.camptocamp.com/geospatial-solutions',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as before

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

geoportal/c2cgeoportal_geoportal/scaffolds/update/CONST_CHANGELOG.txt_tmpl Outdated
* rm {package}/form.py
1. The structure of the project change:
* The package name become `{{package}}_geoportal`.
* The package is in the `folder geoportal`.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

folder geoportal -> folder geoportal (move the quote)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:-)

geoportal/c2cgeoportal_geoportal/scripts/c2cupgrade.py
if re.match(pattern + '$', dst):
print(colorize(
"The {} '{}' is present in the managed_files as '{}' but he will move.".format(
type_, dst, pattern),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

risk of unicode issue ? (with dst ?)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not in python3 :-)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

awww cool 🎉

geoportal/setup.py Outdated
version="2.3.0.dev0",
description="c2cgeoportal",
long_description=README,
classifiers=[
"Programming Language :: Python",
"Framework :: Pylons",
"Programming Language :: Python :: 3",
"Framework :: Pyramid",
"Topic :: Internet :: WWW/HTTP",
"Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
],
author="Camptocamp",
author_email="info@camptocamp.com",
url="http://www.camptocamp.com/geospatial-solutions",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as before

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

@sbrunner
Removes old files
abae6a7
@sbrunner
Do the moves
8fa2b94
@sbrunner
Updates for the new project structure
30db461 
Update the Git ignores
Update the package links
Remove the old model
Add admin l10n
Use the same model
@sbrunner sbrunner merged commit ae7b759 into master Oct 17, 2017
@sbrunner sbrunner deleted the project-structure branch October 17, 2017 19:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ger-benjamin ger-benjamin ger-benjamin left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
2.3.0
Development

Successfully merging this pull request may close these issues.
2 participants
@sbrunner @ger-benjamin