Commit 5d64280a authored by Yunus Sevinchan's avatar Yunus Sevinchan
Browse files

Merge branch 'outsource-utopya' into 'master' 

Outsource utopya

Closes #353, #349, #285, #44, #230, #224, #333, #100, and #11

See merge request !277
parents aa320b21 6e90aad0

.gitignore

+5 −2
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
!*Doxylocal

!*.bib

!*.tex

!*.txt

!LICENSE

!LICENSE.LESSER

!CITATION.cff
@@ -40,10 +41,11 @@ 
# Python and configuration

!*.py

!*.yml

!*.yaml

!*.toml

!*.coveragerc



# Miscellaneous

!python/utopya/utopya/bin/utopia

!.dockerignore

!*.dockerfile

!.gitignore
@@ -53,7 +55,8 @@ 
# Again blacklist certain directories and files completely, e.g. because they

# contain automatically created build artefacts or test metadata

build/

doc/api/utopya

doc/api

doc/_static/_gen

*.egg-info

*.pytest_cache

__pycache__

.gitlab-ci.yml

+190 −194

File changed.

Preview size limit exceeded, changes collapsed.

.gitmodules

0 → 100644
+3 −0
Original line number Diff line number Diff line 
[submodule "doc/_inc/utopya"]

	path = doc/_inc/utopya

	url = https://gitlab.com/utopia-project/utopya

.pre-commit-config.yaml

0 → 100644
+65 −0
Original line number Diff line number Diff line 
# pre-commit configuration for Utopia

#

# NOTE See pyproject.toml for configuration options for some of these tools

---

# -- Hook definitions ---------------------------------------------------------

repos:

  # Manually run this every now and again .....................................

  # Command:  pre-commit run --all-files --hook-stage manual



  # Run if desiring to make use of newer language features

  - repo: https://github.com/asottile/pyupgrade

    rev: v2.37.2

    hooks:

    - id: pyupgrade

      name: upgrade python syntax

      args:

        - --py3-plus

        - --py37-plus

      stages: [manual]



  # Default pre-commit hooks ..................................................

  - repo: https://github.com/timothycrosley/isort

    rev: 5.10.1

    hooks:

      - id: isort

        name: sort imports

        additional_dependencies: [toml]

        types: [python]

        args: [--project=utopya, --settings, pyproject.toml]



  - repo: https://github.com/psf/black

    rev: 22.6.0

    hooks:

      - id: black

        name: black code formatting

        types: [python]

        args: [--safe, --config, pyproject.toml]



  - repo: https://github.com/pre-commit/pygrep-hooks

    rev: v1.9.0

    hooks:

      - id: rst-backticks

        name: check RST backticks



  - repo: https://github.com/pre-commit/pre-commit-hooks

    rev: v4.3.0

    hooks:

      - id: end-of-file-fixer

        name: fix end of files



      - id: check-added-large-files

        name: no large files added

        args: ["--maxkb=256"]



      - id: no-commit-to-branch

        name: do not commit to protected branch directly

        args: [--branch, master, --branch, v1]



      - id: check-merge-conflict

        name: no leftover merge conflict strings



      # TODO Consider activating this as well -- but causes many many changes

      # - id: trailing-whitespace

      #   name: fix trailing whitespace

      #   args: [--markdown-linebreak-ext=md]

.utopia-env-requirements.txt

0 → 100644
+16 −0
Original line number Diff line number Diff line 
# Python packages that are installed into the utopia-env

# ------------------------------------------------------

#

# NOTE These are automatically installed as part of the `cmake ..` call.

#      If their installation fails, a warning (not an error) will be emitted.



# .. Development requirements (required only when pushing to Utopia repo) .....

pre-commit>=2.18





# .. Requirements for Python model tests ......................................

pytest





# .. Requirements for Python model plots ......................................

# ...