Merge pull request #47 from statisticsnorway/testing_efr

Test functions and minor changes

Author: efredborg

.gitignore

@@ -1,3 +1,23 @@
+# This .gitignore file is based on SSB's recommended gitignore template stored
+# in: https://github.com/statisticsnorway/kvakk-git-tools
+# It contains three sections: SSB specific ignores, GitHub's Python-ignore
+# template and GitHub's R-ignore template.
+
+
+# The section below contains SSB specific ignores, not included in the Python-
+# and R-ignores from GitHub.
+*.csv
+*.db
+*.feather
+*.parquet
+*.sas7bdat
+*.xls
+*.xlsx
+*.zip
+
+# The section below is from the GitHub .gitignore template for Python:
+# https://raw.githubusercontent.com/github/gitignore/main/Python.gitignore
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -21,7 +41,6 @@ parts/
 sdist/
 var/
 wheels/
-pip-wheel-metadata/
 share/python-wheels/
 *.egg-info/
 .installed.cfg
@@ -84,15 +103,11 @@ target/
 profile_default/
 ipython_config.py
 
-# pyenv
-.python-version
-
-# pipenv
-#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
-#   However, in case of collaboration, if having platform-specific dependencies or dependencies
-#   having no cross-platform support, pipenv may install dependencies that don't work, or not
-#   install all needed dependencies.
-#Pipfile.lock
+# pdm
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
 
 # PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
 __pypackages__/
@@ -131,9 +146,61 @@ dmypy.json
 # Pyre type checker
 .pyre/
 
-# PyCharm
-.idea/
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# The section below is from the GitHub .gitignore template for R:
+# https://raw.githubusercontent.com/github/gitignore/main/R.gitignore
+
+# History files
+.Rhistory
+.Rapp.history
+
+# Session Data files
+.RData
+.RDataTmp
+
+# User-specific files
+.Ruserdata
+
+# Example code in package build process
+*-Ex.R
+
+# Output files from R CMD build
+/*.tar.gz
+
+# Output files from R CMD check
+/*.Rcheck/
+
+# RStudio files
+.Rproj.user/
+
+# produced vignettes
+vignettes/*.html
+vignettes/*.pdf
+
+# OAuth2 token, see https://github.com/hadley/httr/releases/tag/v0.3
+.httr-oauth
+
+# knitr and R markdown default cache directories
+*_cache/
+/cache/
+
+# Temporary files created by R markdown
+*.utf8.md
+*.knit.md
+
+# R Environment Variables
+.Renviron
+
+# translation temp files
+po/*~
+
+# RStudio Connect folder
+rsconnect/
 
-/.python-version
-/.pytype/
-/docs/_build/
+# ignore poetry in .config
+.poetry/**

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ssb-utdanning"
-version = "0.0.1"
+version = "0.0.2"
 description = "SSB Utdanning Fellesfunksjoner"
 authors = ["Carl F. Corneil <[email protected]>"]
 license = "MIT"
@@ -23,6 +23,8 @@ ssb-fagfunksjoner = ">=0.1.0"
 pandas-stubs = ">=2.1.1.230928"
 types-python-dateutil = ">=2.8.19.14"
 types-toml = ">=0.10.8.7"
+nox = "^2023.4.22"
+nox-poetry = "^1.0.3"
 
 [tool.poetry.group.dev.dependencies]
 pygments = ">=2.10.0"
@@ -44,6 +46,8 @@ xdoctest = { extras = ["colors"], version = ">=0.15.10" }
 myst-parser = { version = ">=0.16.1" }
 ipykernel = ">=6.0.0"
 
+
+
 [tool.pytest.ini_options]
 pythonpath = ["src"]
 
@@ -78,7 +82,7 @@ ignore_missing_imports = true
 [tool.ruff]
 force-exclude = true  # Apply excludes to pre-commit
 show-fixes = true
-src = ["src", "tests"]
+src = ["src"]
 target-version = "py39"  # Minimum Python version supported
 
 # Ruff rules may be customized as desired: https://docs.astral.sh/ruff/rules/
@@ -106,6 +110,7 @@ extend-exclude = [
     ".ipynb_checkpoints",
     "noxfile.py",
     "docs/conf.py",
+    "tests"
 ]
 
 [tool.ruff.isort]

pyproject.toml

@@ -6,9 +6,14 @@
     MOCKING (bool): Whether the application is running in mocking mode.
     PROD_FORMATS_PATH (str): The path to the production formats.
 """
+import os
 
-
-MILJO = "PROD"
 TESTING = False
 MOCKING = False
+
+ENVIR = os.environ.get("DAPLA_ENVIRONMENT", "TEST")
+SERVICE = os.environ.get("DAPLA_SERVICE", "JUPYTERLAB")
+REGION = os.environ.get("DAPLA_REGION", "ON_PREM")
+
 PROD_FORMATS_PATH = "/ssb/stamme01/utd/utd-felles/formater/"
+DATETIME_FORMAT = "%Y-%m-%dT%H-%M-%S"