Commit edeb9ca5 authored by Valentin Valls's avatar Valentin Valls
Browse files

Remove '-conda' suffix from requirement files

parent 2c64846a
......@@ -45,7 +45,7 @@ check_style:
except:
- master
script:
- pip install -r requirements-dev.txt
- conda install --file requirements-dev.txt
# run black
- LC_ALL=C.UTF-8 black --check --safe $(git diff origin/$COMPARE_BRANCH_NAME... --diff-filter=ACMR --name-only | grep \\.py$)
......@@ -57,7 +57,7 @@ check_style_master:
tags:
- bliss_master
script:
- pip install -r requirements-dev.txt
- conda install --file requirements-dev.txt
# run black
- LC_ALL=C.UTF-8 black --check --safe $(git diff origin/$COMPARE_BRANCH_NAME... --diff-filter=ACMR --name-only | grep \\.py$)
......@@ -65,7 +65,7 @@ check_lint:
stage: style
image: continuumio/miniconda3:latest
script:
- pip install -r requirements-dev.txt
- conda install --file requirements-dev.txt
# run flake8 on diff between current branch and last common ancestor with master
- git diff -U0 origin/$COMPARE_BRANCH_NAME...$CI_COMMIT_SHA | flake8 --diff
# allow failure without impacting the rest of the CI (will show an orange warning in the UI)
......@@ -88,7 +88,7 @@ check_lint:
# install Xvfb and opengl libraries (needed for test_flint)
- apt-get update && apt-get -y install xvfb libxi6
# create test env and install BLISS
- conda create --quiet --name testenv --file requirements-conda.txt --file requirements-test-conda.txt
- conda create --quiet --name testenv --file requirements.txt --file requirements-test.txt
- source activate testenv
- conda install pytest-profiling --yes
- pip install . --no-deps
......@@ -211,7 +211,7 @@ package:
# install opengl libraries (needed to avoid problem with pyopengl dependency)
- apt-get update && apt-get -y install libgl1-mesa-glx
# create package env and install all requirements and conda-build, (gcc and g++ compiler required for flint)
- conda create --quiet --name buildenv --file requirements-conda.txt --file requirements-test-conda.txt conda-build
- conda create --quiet --name buildenv --file requirements.txt --file requirements-test.txt conda-build
- source activate buildenv
# create links to reach prefixed compilers of conda
- ln -s /opt/conda/envs/buildenv/bin/x86_64-conda_cos6-linux-gnu-gcc /opt/conda/envs/buildenv/bin/gcc
......@@ -285,7 +285,7 @@ create_reference_doc:
# install opengl libraries (needed to avoid problem with pyopengl dependency)
- apt-get update && apt-get -y install libgl1-mesa-glx
# create doc env and install all requirements
- conda create -q --yes --name docenv --file requirements-conda.txt --file requirements-doc-conda.txt
- conda create -q --yes --name docenv --file requirements.txt --file requirements-doc.txt
- source activate docenv
# build of documentation
- python setup.py build_sphinx
......@@ -302,7 +302,7 @@ create_user_doc:
# install opengl libraries (needed to avoid problem with pyopengl dependency)
- apt-get update && apt-get -y install libgl1-mesa-glx
# create doc env and install all requirements
- conda create -q --yes --name mkdocsenv --file requirements-conda.txt --file requirements-doc-conda.txt
- conda create -q --yes --name mkdocsenv --file requirements.txt --file requirements-doc.txt
- source activate mkdocsenv
# build of documentation (-s : strict : fail on warnings)
- cd doc && mkdocs build -s
......@@ -321,7 +321,7 @@ create_user_doc:
- mv bliss source # to avoid import errors (we want to test the packet, not local bliss folder)
- conda create -y --name testenv
- source activate testenv
- conda install bliss==$CI_COMMIT_TAG --file requirements-test-conda.txt --channel file://${CI_PROJECT_DIR}/conda-local-channel
- conda install bliss==$CI_COMMIT_TAG --file requirements-test.txt --channel file://${CI_PROJECT_DIR}/conda-local-channel
- echo ${PYTEST_ARGS}
- pytest ${PYTEST_ARGS}
......
......@@ -14,7 +14,7 @@ In short
To update BLISS from source:
```
conda install --file ./requirements-conda.txt
conda install --file ./requirements.txt
exit and re-enter into conda environment
......
......@@ -32,7 +32,7 @@ in a conda environment.
```bash
cd <bliss.git directory>
conda install --file requirements-doc-conda.txt
conda install --file requirements-doc.txt
```
This installs `mkdocs` and all dependencies.
......@@ -151,7 +151,7 @@ To easily view the result of your writing, using a local rendering:
* Create or use a conda environment with good packages installed:
* sphinx / graphviz / pygments / mkdocs / mkdocs-material
* pymdown-extensions / markdown-inline-graphviz / Markdown
* These packages are in `requirements-doc-conda.txt`
* These packages are in `requirements-doc.txt`
!!! note "At ESRF"
At ESRF, enter the BLISS development conda environment to install documentation requirements:
......@@ -161,7 +161,7 @@ To easily view the result of your writing, using a local rendering:
```bash
cd <bliss.git directory>
conda install --file requirements-doc-conda.txt
conda install --file requirements-doc.txt
```
* launch `mkdocs` in server mode in your conda environment:
......
......@@ -331,18 +331,16 @@ for ESRF, see: <http://wikiserv.esrf.fr/bliss/index.php/BLISS_Releasing>
├─ scripts/
├─ spec/
├─ tests/
├─ LICENSE LGPLv3 license description
├─ pre-commit.sh script to install git-hook to autoformat code with "black"
├─ README.md documentation entry-point
├─ .gitignore files to be ignored by git
├─ .gitlab-ci.yml configuration of the continuous integration workflow
├─ .gitmodules git submodules (empty now)
├─ .pre-commit-config.yaml config to get "black" module for git commit hook
├─ requirements-conda.txt modules to Conda-install to run BLISS
├─ requirements-dev.txt modules to Conda-install to develop BLISS
├─ requirements-doc-conda.txt modules to Conda-install to build documentation
├─ requirements-test-conda.txt modules to Conda-install to run tests
├─ setup.cfg options to use for test; aliases;
└─ setup.py BLISS configuration file
├─ LICENSE LGPLv3 license description
├─ pre-commit.sh Script to install git-hook to autoformat code with "black"
├─ README.md Documentation entry-point
├─ .gitignore Files to be ignored by git
├─ .gitlab-ci.yml Configuration of the continuous integration workflow
├─ .pre-commit-config.yaml Config to get "black" module for git commit hook
├─ requirements.txt Modules to Conda-install to run BLISS
├─ requirements-dev.txt Modules to Conda-install to develop BLISS
├─ requirements-doc.txt Modules to Conda-install to build documentation
├─ requirements-test.txt Modules to Conda-install to run tests
├─ setup.cfg Options to use for test; aliases;
└─ setup.py BLISS configuration file
```
......@@ -18,7 +18,7 @@
```
conda create --name testenv \
--channel esrf-bcu --channel defaults --channel tango-controls --channel conda-forge \
--file requirements-conda.txt --file requirements-test-conda.txt
--file requirements.txt --file requirements-test.txt
source activate testenv
```
......@@ -138,14 +138,6 @@ TEST_SESSION[1]: limaDev = config.get("lima_simulator")
`pytest tests/nexus_writer/ --durations=30 -m writer --runwritertests`
## Tests and Continuous Integration
All tests but hardware-related ones are automatically run during
......
......@@ -32,7 +32,7 @@ The Git repository is the reference point to install the latest development vers
```bash
git clone https://gitlab.esrf.fr/bliss/bliss
cd bliss/
conda install --file ./requirements-conda.txt
conda install --file ./requirements.txt
pip install --no-deps -e .
```
......
......@@ -33,7 +33,7 @@ For the development version, i.e in the `bliss_dev` Conda environement:
* install up-to-date dependencies:
`conda install --file ./requirements-conda.txt`
`conda install --file ./requirements.txt`
* **Exit and re-enter** into the conda environment to ensure using up-to-date modules.
......
# Conda requirement file
# Test requirements
black == 18.6b4 # used by test_patches
lima-core >= 1.9.6
lima-camera-simulator >= 1.9.2
lima-camera-simulator-tango >= 1.9.2
......
......@@ -21,9 +21,9 @@ from setup import console_script_entry_points
META = os.path.join(CURDIR, "meta.yaml")
if sys.platform in ["win32", "cygwin"]:
REQ_PATH = os.path.join(BLISS_DIR, "requirements-conda-win64.txt")
REQ_PATH = os.path.join(BLISS_DIR, "requirements-win64.txt")
else:
REQ_PATH = os.path.join(BLISS_DIR, "requirements-conda.txt")
REQ_PATH = os.path.join(BLISS_DIR, "requirements.txt")
# regex
conda_pack_regex = re.compile(
......@@ -204,13 +204,13 @@ def main():
# conda current environment
body["requirements"]["run"] = list()
# matching beetween requirements-conda.txt and
# matching between requirements.txt and
# current installed version of packages
# populating a dictionary with installed packages
conda_req_current_env = dependencies_conda()
# reading requirements-conda.txt to get only package names
# reading requirements.txt to get only package names
# versions will be taken from current environment
conda_req_file = conda_requirements_txt(REQ_PATH)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment