Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • MaitresNageurs/README/LabelsTower
  • perus/LabelsTower
  • DeletedUser/LabelsTower
  • chamont/LabelsTower
  • erichard/LabelsTower
5 results
Show changes
Commits on Source (332)
# Python
__pycache__
*.pyc
*.egg-info
build
# PyCharm
.idea/
# Environnements de developpement
venv/
# MacOS
.DS_Store
# Databases
*.sqlite
*.db
# protection contre un retour de requirements.txt
# dans le répertoire racine...
requirements.txt
image: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
stages:
- BuildImage
- SetupPackage
- PrepareDb
- UnitTests
- PackageTests
build:
stage: BuildImage
image: docker:stable
services:
- docker:stable-dind
script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker pull $CI_REGISTRY_IMAGE:latestci || true
- cd docker
- docker build -f Dockerfile_externals --cache-from $CI_REGISTRY_IMAGE:latestci --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA --tag $CI_REGISTRY_IMAGE:latestci .
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
- docker push $CI_REGISTRY_IMAGE:latestci
setup_wheel:
stage: SetupPackage
script:
- echo -n "latestci" > dist/version.txt
- dist/build.sh
- ls dist
artifacts:
paths:
- dist
init_sqlite:
stage: PrepareDb
script:
- export LT_CFG=Voiture
- dist/install.sh
- test/instance/init_db.sh
artifacts:
paths:
- test/instance
test_sqlite:
stage: PackageTests
script:
- export LT_CFG=Voiture
- cd test/instance
- ls -l ${LT_CFG}.sqlite
doctests:
stage: UnitTests
script:
- test/scripts/run_doctest.sh
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "{}"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright 2018 MaitresNageurs / README
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
# Labels Tower
# Système d'étiquettage utilisé par le projet Piscine
Some python code for management of labels within a Flask application.
For demo pupose, one must define either `LT_CFG=Voiture` or `LT_CFG=CodingPool`.
## News
* Création de la BDD
* Possibilité d'ajouter des labels et des alias dans un formatage particulier (les labels sont liés ensembles).
## Directories
## A venir
* Affichage des labels parent puis de ses enfants quand on clique dessus (50%).
Most directories have their own `README.md`.
* `labelstower` : main code, i.e. a blueprint for Flask.
* `docker` : anything for building docker images with all the needed externals.
* `dist` : where we build and store wheel distributions of the main labelstower code.
* `test/instance` : where we initialize a test sqlite database.
* `test/demo` : web demo application.
* `test/scripts` : various command-line test.
## Etapes
Affichage des labels => Ajouts de tutos => Affichages des tutos
(Avant la fin de la semaine si possible)
## Demonstration from scratch, with Docker
## Installation
$> sudo apt-get install python3 python3-pip virtualenv
$> virtualenv labelsTower
$> cp -R app/ labelsTower/
#Dans labelsTower/
$> source bin/activate
$> sudo python3 -m pip install flask
$> export FLASK_APP=app/labelsTower.py
With the help of Docker :
1. Build the dev Docker image : `docker/build_externals.sh`
1. Build the labelstower distribution : `docker/run_externals.sh dist/build.sh`
1. Build the demo Docker image : `docker/build_latest.sh` (it includes the above distribution)
1. Initialize a database : `docker/run_latest.sh instance/init_db.sh`
1. Starts the flask server : `docker/run_latest.sh`
# ignore wheel file until distribution is ready for production (if ready => git add --force .*whl)
*.whl
\ No newline at end of file
MIT License
Copyright (c) 2020 CNRS
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
\ No newline at end of file
#!/usr/bin/env bash
# This ensures that we are in this script directory,
# even if we call it from another one.
SCRIPT_NAME=${BASH_SOURCE[0]}
cd `dirname ${SCRIPT_NAME}`
cp -f setup.py LICENSE MANIFEST.in ..
rm -rf ../labelstower.egg-info
mv -f labelstower.egg-info ..
cd ..
python3 setup.py bdist_wheel
rm -f setup.py LICENSE MANIFEST.in
mv -f labelstower.egg-info dist/
\ No newline at end of file
#!/usr/bin/env bash
# This ensures that we are in this script directory,
# even if we call it from another one.
SCRIPT_NAME=${BASH_SOURCE[0]}
cd `dirname ${SCRIPT_NAME}`
# Look current version
version=`cat version.txt`
# Install
pip3 install labelstower-${version}-py3-none-any.whl
\ No newline at end of file
File added
import setuptools
with open("README.md", "r") as readme_file:
long_description = readme_file.read()
with open("dist/version.txt", "r") as version_file:
version_content = version_file.read()
setuptools.setup(
name="labelstower",
version=version_content,
author="IJCLab",
author_email="ing-info-developpement@ijclab.in2p3.fr",
description="Label sorting system",
long_description=long_description,
long_description_content_type="text/markdown",
url="https://gitlab.in2p3.fr/MaitresNageurs/README/LabelsTower",
packages=["labelstower"],
include_package_data=True,
classifiers=[
"Programming Language :: Python :: 3",
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
],
python_requires='>=3.6',
install_requires=[
],
)
0.0.4
\ No newline at end of file
# Version EXTERNALS
FROM python:3.6.6-slim-stretch
# Ensure use of bash
SHELL ["/bin/bash","-c"]
# Sqlite3
RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update \
&& apt-get install -yq apt-utils \
&& apt-get install -yq sqlite3 \
&& apt-get install -yq curl \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
# Install flask
RUN pip3 install --upgrade pip setuptools wheel
COPY requirements.txt requirements.txt
RUN pip3 install --trusted-host pypi.python.org -r requirements.txt
# Run flask in development mode
EXPOSE 5000
ENV FLASK_APP=test/demo
ENV FLASK_ENV=development
ENV LABELSTOWER_USER_OPTION=false
ENV LC_ALL=C.UTF-8
ENV LANG=C.UTF-8
COPY flask.sh flask.sh
CMD [ "/flask.sh" ]
# Version LATEST
FROM labelstower:externals
# Ensure use of bash
SHELL ["/bin/bash","-c"]
# Install labelstower
RUN pip3 install --upgrade pip setuptools wheel
COPY labelstower-latest-py3-none-any.whl labelstower-latest-py3-none-any.whl
RUN pip3 install labelstower-latest-py3-none-any.whl
# Run flask
EXPOSE 5000
ENV FLASK_APP=demo
ENV FLASK_ENV=production
ENV LC_ALL=C.UTF-8
ENV LANG=C.UTF-8
COPY flask.sh flask.sh
CMD [ "/flask.sh" ]
LAST MINUTE : if you want to run such a container with no command,
that is with the default flask command, then one must define `LT_CFG``
environment variable before, so that docker defines `LABELSTOWER_ENV=demo.config.Config${LT_CFG}`
for the need of the demo web application.
# Directory for Docker images and utility scripts
* The "externals" flavor of scripts produce a `labelstower:externals` image, containing only the external software needed for the development of labelstower.
* The "lastest" flavor of scripts produce a `labelstower:latest` image, containing an installation of the latest labelstower package found in `../dist/`.
## Requirements
Testing the LabelsTower code thanks to Docker requires only Docker to be installed. Yet, if one wants also to take profit of the utility scripts provided in the current directory, the command `/usr/bin/env bash` (used as a shebang in the scripts) must return a valid bash shell.
## Scripts
The commands below are meant to be launched within the `docker` directory :
* `build_externals.sh` : build a local image for development.
* `run_externals.sh` : start a container with the previous image, mounting `..` as `/work`. by default, it is starting the flaks server, but can be used with optional other commands.
Note : as one can see in the `Dockerfile_externals` file, Flask is started with the option `--host 0.0.0.0`, which is necessary so that the http server, running potentially on a small virtual machine (at least on MacOS and Windows), can be seen from the real local machine.
## Usages of `run_externals.sh`
The `run.sh` script can be be given optional additional commands :
* `run_externals.sh` : starts a flask web server.
* `run_externals.sh dist/build.sh` : build a new wheel in `dist`.
* `run_externals.sh instance/pip_init_db.sh` : install the wheel and initialize a database in `instance`.
Note : the `run.sh` script starts a docker container with the option `--rm`, meaning when the container command ends, the container is automatically removed, and anything which was not stored in the `/work` directory (a mount of `..`) will be lost. This typically concerns commands such as `pip3 install ...`, whose affects root internal directoris of the container.
## About builtin the Docker image in Gitlab-CI (Docker in Docker)
* https://jpetazzo.github.io/2015/09/03/do-not-use-docker-in-docker-for-ci/
* https://docs.gitlab.com/ee/ci/docker/README.html
#!/usr/bin/env bash
# This ensures that we are in this script directory,
# even if we call it from another one.
SCRIPT_NAME=${BASH_SOURCE[0]}
cd `dirname ${SCRIPT_NAME}`
docker build -f Dockerfile_externals -t labelstower:externals .
# --force-rm --no-cache
#!/usr/bin/env bash
# This ensures that we are in this script directory,
# even if we call it from another one.
SCRIPT_NAME=${BASH_SOURCE[0]}
cd `dirname ${SCRIPT_NAME}`
# Get current labelstower package
version=`cat ../dist/version.txt`
cp ../dist/labelstower-${version}-py3-none-any.whl labelstower-latest-py3-none-any.whl
docker build -f Dockerfile_latest -t labelstower:latest .
# --force-rm --no-cache
# cleaning
rm -f labelstower-latest-py3-none-any.whl
\ No newline at end of file
#!/usr/bin/env bash
export PYTHONPATH=`pwd`
export LABELSTOWER_ENV="demo.config.Config${LT_CFG}"
flask run --reload --host 0.0.0.0
Click==7.0
Flask==1.1.1
Flask-Mail==0.9.1
itsdangerous==1.1.0
Jinja2==2.10.3
MarkupSafe==1.1.1
Werkzeug==0.16.0
WTForms==2.2.1
Flask-Login==0.4.1
cryptography==2.7
SQLAlchemy==1.3.13
Flask-SQLAlchemy==2.4.1
Flask-Cors==3.0.8
asn1crypto==1.0.1
blinker==1.4
cffi==1.12.3
pycparser==2.19
six==1.12.0