3l_?SdHOsK%P*fHrfp
zGmI+haLl@8$l>|^(Tja?J9mv_1HsMz#8-Z0gmuL5?gc?%?(T+A=53>WbH6yJea8ZX
z1_cA>=XDd3-h>o!J4}WWUZEix;25J1$RWr8aj#7?5eONRERme}s4CflsHo({}h
zmK+tjR?p$)S4=4iX)x-NtHzhKa1vc+7Kv#pW>fSI=^F3T9rj)@Vu{f*B<2vxT5N}$
zYvyP9@bG=-03R4BiV*woUKzop%dlVjh~or0IG-k|3(42bu;DCTJ79`A0pQS%$ox_#W6zwzuJGToFOJSYtr0yPoTfy8~Z)*ICdqyVW-ozSe)l6Q%aW10V4Jm
zW$?B6KLPaMn5O6J=WQ}S=8ztI=_lqpcF
zVi1>1%E5$nEL5zuBF$?s33S35ov;z+_h|Jv+#N?RNyaNu%USabE@#;HaqP$P6}nglmLF%>Cdqt$A$O{|z22)+cV++{U6Cf@oP2K&(
z+^G{B9}bu{79GG{@H*~-rWLC1oV5~IaDV#ZrPf|{*mIjB;?%a*;?DMX-FvXfwh34%
zw6>ABUSzrTP*aF<*=$OSIT{ZtDaU$DN*(Y3v+b}oAccS>va;i?H?A&N4n0AwW8;sl
z8)WTgBrA?LsdmU>`kpv?WZm!sEiN_|aih;tUq}
zahK-_bmORHkd+PZ?`8YyX_eAH$1g>|U8rC{|Dc;Tq5H!L&~@me*fLZAw&@l3X^L
zMw?v;;ajR1H1upj=(Vyf=o6lx$?0V;u^1s1%!~PT4n$M))5gtY_>XBoqmF#DKrxf5
ztCryOZ3pC}o?Eu$w7ZvLlbZZ7WpM!a*4kbh7-R>;Yi@3p_pXC$IteiGdGMp)FcoWP
zYMIF-6K2W?_1qyODTmEK;TPH|-6JfUblgT?M`8#eYPbRLU!okRlImYDzW)qi0?o)r
z(HWrrQG;!*&=dzJ_FlC-T`a3{0;O5d&5|UAC)(IkC|e{Ku9hW?F;HmhOA*n+`FCm?
z<&&ap^{;Ysh!5Xs45XKz_b6#s++^&HZ%^vxC{qcX_SdqG4mw18J6>8|kB&#R+Rwdgr`$`}`Hxc0U>vZfGc9Pa5r{<{z>{Xuf7c7)%
zWUE1V1t?Y(`@?R1J$2Ox$&eRjq&cYqnj|Iy{H`$uto6U3!a?Q+Q*`6~gni@?zR3bS6hnwlGjpmKP)-`w@L~^j^hUxBxW}k7P
zy^ufN@d&Pa-jXC)qf5G^gsV4X2E(k33xj)h*F^hIlpq21brk@SIZLbTWIyPlTRb_!01Yf`v{
z0{wmH)~$;B7=6BET8|`Bd8KA70Wl^92e?}OC_~rwy$)+7qM5W3E{8}LC
zKs{xGga?Lvr>eL>`t=x=rA?iy_R%jb*-dRfX4NJ65|Z(%%}X+wv9io?$q1eS8=SeM
zxl*71!S6CgEfKIRriFu+ZDu@nY$Q(lLzW}LWZ*i@?bh$HO)1k}N&6VdsLz|ey%MW}7gw-ebC+85}XdMNEi
zszDu05>xYRfZ~LbjS|kSpdg{*;v2i>q7oM(z>|aXKIu|U{it=uEG!R;=;gWqF{Jq-+)$V$Q8?o$8A<^Gl-9*V#?e3{a`GF
z*1q)aZX#!u!{rcTq}w_CE3YTn-YMEiB*97Kj@|+oup}aVVawWr_p9X=8olk*BI!h}
zZ`o-L?5gl8Tl#>r_c-+e=OTXs!)PoTIbw*UUJ0ShH|ca)gQ8kRmm_*gyA;`+=E>=#
zdSaU_Hy@*{cBYEX$=$=tvN4tP`ra*M)SN`OYykSV(8o-WuJ&0BO+MN`&=pY!sGP`A^E2`4Xx?jQwn|%!}qE;#e6?#k9iv(k8#u+Xe{q6_7J4XlZ*|
zJD4!shDy2#T}xcrn?Fl++QOiEdBq!`rDGOuZ+T#msV$RhOS#=R+vu*w!z`GIi+Ixc
z-E~^LH}0^gUYCY`=5?7mwL)vET6Pv>Pl{Q6(g-n=WHLLk-uOhfKGgv|#0rbzvX(TW
z7G4F=FY!kXlM9Ew2Wxuho9&ww`)(?F!IvpBo+Js$$0ZI&zr;i&$&?pDnk<;3xU^o4
zQZd88(rdq^zQVwBg*^W3u1-lq&RvA6WF(3y4sN?BbR-!hW?GpBf>i%|LW}^t)B589gc^QmTf6l)^cHlQ(||2pwDFXf
zB9Gy5k#*mPC@U^SWDTEuEha-(Gc)XKE)et%w;|JZd(F*DeUV6^_6Sb|u7v1MiCn^$
zR~Q0qeHhum#c_fI0nP!4#FJl`gJ6{pfTE6Q9@DL
zLm`5?3AdwC)`IJ4Gkf`NFqb-2tSfc9Jh|>?gFDO5QwR2WHg@oMpP0oscMIAnB|!Wq
zek!xJYGf8#2{N3n2DkL4VM`KLR)wEakO;+wb(e7B7_yxtsGBsjD`sn`B2~&T&Qcm6
zlts1fI3cIlb4>JqI^1l_AK!Avvy5UzHo7+gV5lR;@QZ)W+j$)a)$bezAFo*scc&tG
z>0Y&ZG1bSC6J`Sss_c`(=od=f%3f*^lgai;^%A}b+dsp4M#F1-YilxbkT6=mRle3%
zRn#7SE++_5_wTG~{>AG0XmSqgq-yBKndmbPL3B+SqPaZ@%A}A|n8G{?6>bO%PZHz|Uo)MN
zcKD36Fyz!tg9FT)AX2UKB{B*eiW5Y|Cr}jmtazdaS;pB~lO!3n2jH5E%TX#HF6#3u
zI1*+^;N^3aU=S+9c4r9(bgW?*_Ru_}MbJWuKdugy#e2vkF|@kMs?i3iKAJSiPqVKIUI-o%_6z(wz#{
z5D6{nIENaLiautYXwRBto5U^UFlVVh?#e*TI;ow{5Unri1X(`;)Z&;fI
z>lz`{xQ0jCI;6B~cD(Sr^yu93PN7b5Z+A|{tfhT(DLSuOvoX9S}&Kl8vK2plh^NyQ43~y{EfuJq)EZGV5(BwH9RyeDJ9DmvfGdyWf4lvr>_?ZiK~%Lp{P=7
zyW79
z53ZzF)|y&Nos6eBGv{}f+uGYa-INrH>mejfj(nWoCbgQ}NY@rt^h{5^^)BKDIZ36>
zpqdRB+Cr&fA6~1JfUnMl$MXxNj_S}y?C^oaJJwfxRR^QDFTUIg+v>|b51j9oa*H2_
zkoJY2haVR_9TkjOUMgBxg|}Lpk7GEP@qF5S@~~c>d4XDC_Hdj=EJ<3kU`T-@2>Plz
zoC=AF=(sAP>5pzpEo&1ez|m{R@?0$R^@YqDTAm8Ov5r2~o#$mFClmGn+-i39YZQY}
zNG@-y^n_4>4nr)*Pwc4!%W%TWUYRIj_@pO3nkS`+&g2fnYkJQ(5O!9G26S4Mja|YP
z$-d#(%2SSus*E>e)r8GM@i1+azT~ds`hPADKSEirBU6q!CZd
zm!5!@5Yk-9KAp&zSp7vi+LG`t=e&jTv3~}<&>k&cNaO!a5
z2blX*%qPR2h119jCeyel*Cvj2WsX=Jm32v_Wz^bc=ijlv>PU2hnX5E};o>JOhFH_9
z;brtmcZB{(wEpEyO>S-kEx^Z&lGX_>KyfnM3GcfOj(M_z!x^V3H^Xtg*(pG(g(zl(
z2^ai*l28e@d2b`Z_rA7`%Q-5;MiY~rJRcReX10RGyt+z5qIr(!@HhM|!7iSNZnSNE
zw?^(tg11OB@`{ievl`db&6J@@V2#|;ZsS^YcQr$W-t?Z-vg2Bd*;QF-bDh`_t)N_V
z%~UlK1*M=zbPbHF4F8!Oo%>cQ^1zeP?)c{sU+oMNyzfi5b%Z8xBh|@^>T2xA_3;&K
z%#^7X)zx@vP?T~MBhzdd+x@njUh;;w
zgBdv@`s2uf2IJG?oMxBb>iy*9A@fvo
zIm)scw^EG_qCK9!v!@B1>3dNM@!R+};!#0=fH!+qv0}OEZu>|$q{wzFA``&c)@f!-Zed_Fqf;f9T$w-u;s~!o2|N!
z19nZgj|Lh6kBn{O_vjdZmNpa6S{)api=8>
zRpi$J1p?AW1K=ZRWqbBJaOQ((Cj)R)`oL~g5baS~P|KoLh$E_@s)W!B)4qWaSrNSb
z?ewou`7H2O^z=rc)2SV)1^MNV*RN7x70rdY^(2dQ~p&~FL*s%giVcTCb&b*?#W<&QIn2dr()#bHWd|H;hxONsD9%~8<6PS4iF+TP0c5AWv#
zlGd?!S8J3|QWRGfpj0%l)z`7q`PWTh9Sak47XtEs;1qw|FxN497iOgY*HiycF{EZ>
zV
z3CKTyfR44Ofr*jvyKv-tJAWWKdjkta0@i0sI=26uzNF4St^xFbKj#1K<#%qy
zAMwTyx`mMCyP~U!r4a$Gl8GgsrJcz?fj@RiCi?cqcJGpy3``%KrvH2~GBFZ-ygz7A
zA3B?VoqzmhW?=gNeE(-lf1NY4zFV=e60oqmt9def5Lj4Pm#Zn6RG2MF0LgJp%y~8`GZ|eVl*v
zMbGjv4<L;n7cuoSRz_z))j52epP{{3eQ0`I!J
z@0mhCuBT&SYefK{0Wi|A5|A6)+gr2KzKg29gGRPG*2X4!b~IMDMihT#hperYzJuPo
zj_?1y*}wU8fPWM7{u!(?Pvw%0CVQW+tZh
z;4mck3uB;T`f&WmL16h0>^=3^-lOwx7~O|c|AsNWhsWPBws*18|Hc^T=-$bC|BV5d
znd$zYeXub8eJlXxkJ0|!mg$4P_;LJe%m5Y!ws#l(9blk
z?-=uY0{oXPJsS(#d%*tK@w2Ll}o^MCYVZ>#hEsbu>{I9ATY)!<`|
vK0XS*TUouw-N#!0B_S(jY4{#re?s#w9+r-+{hw83pksYEAt4cx5r+CdSB)p)
diff --git a/pyproject.toml b/pyproject.toml
index fa2fecef2..f59cef5ab 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,3 +1,39 @@
+[tool.pytest.ini_options]
+minversion = "6.0"
+# opts:
+# `--dist=loadscope ` - run tests within classes in series
+# `--strict-markers` - Raise error on unexpected pytest markers being used (add new markers to `markers` config)
+# `-nauto` - parallelise over as many threads as possible (uses pytest-xdist). If debugging (`--pdb`), this will default to one thread.
+# `--nbmake --nbmake-kernel=calliope` - test example notebooks using the "calliope" notebook kernel (uses nbmake)
+# `--cov --cov-report=xml --cov-config=pyproject.toml` - generate coverage report for tests (uses pytest-cov; call `--no-cov` in CLI to switch off; `--cov-config` include to avoid bug)
+addopts = "-rav --dist=loadscope --strict-markers -nauto --nbmake --nbmake-kernel=calliope --cov --cov-report=xml --cov-config=pyproject.toml"
+# TODO: add testpath once notebooks are fixed: "doc/_static/notebooks"
+testpaths = ["tests"]
+
+# to mark a test, decorate it with `@pytest.mark.[marker-name]`
+markers = ["serial", "time_intensive"]
+filterwarnings = [
+ # https://github.com/pytest-dev/pytest-xdist/issues/825
+ "ignore:The --rsyncdir command line argument and rsyncdirs config variable are deprecated.:DeprecationWarning",
+ "ignore:.*`group_share` constraints will be removed in v0.7.0.*:FutureWarning:",
+ "ignore:.*Plotting will no longer be available as a method.*:FutureWarning:",
+ "ignore:.*There will be no default cost class for the objective function in v0.7.0.*:FutureWarning:",
+ "ignore:.*`charge_rate` is renamed to `energy_cap_per_storage_cap_max` and will be removed in v0.7.0.*:FutureWarning:",
+ "ignore:.*Deprecated, pass a TempConstr or use Model.addLConstr.*:DeprecationWarning:pyomo",
+ "ignore:.*distutils Version classes are deprecated.*:DeprecationWarning:",
+ "ignore:.*`np.float` is a deprecated alias.*:DeprecationWarning:",
+]
+
+[tool.coverage.run]
+branch = true
+source = ["src/"]
+
+[tool.coverage.html]
+directory = "reports/coverage"
+
+[tool.coverage.xml]
+output = "reports/coverage/coverage.xml"
+
[tool.black]
line-length = 88
target-version = ['py37', 'py38']
@@ -46,3 +82,56 @@ convention = "google"
[tool.ruff.pycodestyle]
max-doc-length = 200
ignore-overlong-task-comments = true
+
+[tool.setuptools.packages.find]
+where = ["src"]
+include = ["calliope*"]
+
+[tool.setuptools.package-data]
+calliope = ["config/*", "math/*", "example_models/**/*"]
+
+[tool.setuptools]
+license-files = ["LICENSE", "CITATION"]
+
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "calliope"
+authors = [
+ { name = "Calliope contributors listed in AUTHORS", email = "stefan@pfenninger.org" },
+]
+maintainers = [
+ { name = "Stefan Pfenninger", email = "stefan@pfenninger.org" },
+ { name = "Bryn Pickering", email = "17178478+brynpickering@users.noreply.github.com" },
+]
+description = "A multi-scale energy systems modelling framework."
+readme = "README.md"
+requires-python = ">=3.9"
+keywords = ["energy systems", "optimisation", "mathematical programming"]
+license = { text = "Apache 2.0" }
+classifiers = [
+ "Intended Audience :: Science/Research",
+ "License :: OSI Approved :: Apache Software License",
+ "Programming Language :: Python",
+ "Programming Language :: Python :: 3",
+ "Programming Language :: Python :: 3 :: Only",
+]
+dynamic = ["version", "dependencies", "optional-dependencies"]
+
+[tool.setuptools.dynamic]
+dependencies = { file = ["requirements/base.txt"] }
+version = { attr = "calliope._version.__version__" }
+
+[project.scripts]
+calliope = "calliope.cli:cli"
+
+[tool.setuptools.dynamic.optional-dependencies]
+dev = { file = ["requirements/dev.txt"] }
+
+[project.urls]
+website = "https://www.callio.pe/"
+repository = "https://github.com/calliope-project/calliope"
+documentation = "https://calliope.readthedocs.io"
+changelog = "https://github.com/calliope-project/calliope/changelog.rst"
diff --git a/pytest b/pytest
deleted file mode 100644
index e69de29bb..000000000
diff --git a/pytest.ini b/pytest.ini
deleted file mode 100644
index a829721e8..000000000
--- a/pytest.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[pytest]
-filterwarnings =
- ignore:.*`group_share` constraints will be removed in v0.7.0.*:FutureWarning:
- ignore:.*Plotting will no longer be available as a method.*:FutureWarning:
- ignore:.*There will be no default cost class for the objective function in v0.7.0.*:FutureWarning:
- ignore:.*`charge_rate` is renamed to `energy_cap_per_storage_cap_max` and will be removed in v0.7.0.*:FutureWarning:
- ignore:.*Deprecated, pass a TempConstr or use Model.addLConstr.*:DeprecationWarning:pyomo
- ignore:.*distutils Version classes are deprecated.*:DeprecationWarning:
- ignore:.*`np.float` is a deprecated alias.*:DeprecationWarning:
-markers =
- serial
- time_intensive
\ No newline at end of file
diff --git a/requirements.yml b/requirements.yml
deleted file mode 100644
index 1854d3fc6..000000000
--- a/requirements.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: calliope
-
-channels:
- - conda-forge
-
-dependencies:
- - bottleneck < 2
- - coverage >= 4.4
- - codecov < 3
- - glpk = 5.0
- - hdf5 < 2
- - libnetcdf < 5
- - pre-commit < 4
- - pytest-cov < 5
- - pytest-xdist < 4 # pytest distributed testing plugin
- - pytest < 8
diff --git a/requirements.txt b/requirements/base.txt
similarity index 93%
rename from requirements.txt
rename to requirements/base.txt
index a11945da0..639f9448e 100644
--- a/requirements.txt
+++ b/requirements/base.txt
@@ -1,5 +1,5 @@
click >= 8, < 9
-ipython >= 8, < 9
+ipykernel < 7
ipdb >= 0.13, < 0.14
jinja2 >= 3, < 4
jsonschema >= 4.17, < 4.19
diff --git a/requirements/dev.txt b/requirements/dev.txt
new file mode 100644
index 000000000..1c3a8be25
--- /dev/null
+++ b/requirements/dev.txt
@@ -0,0 +1,11 @@
+bottleneck < 2
+coverage >= 4.4
+codecov < 3
+glpk == 5.0
+hdf5 < 2
+libnetcdf < 5
+pre-commit < 4
+pytest-cov < 5
+pytest-xdist < 4 # pytest distributed testing plugin
+pytest < 8
+nbmake < 2
\ No newline at end of file
diff --git a/requirements_docs.yml b/requirements/docs.yml
similarity index 100%
rename from requirements_docs.yml
rename to requirements/docs.yml
diff --git a/setup.py b/setup.py
deleted file mode 100644
index 80545c2b9..000000000
--- a/setup.py
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env python
-
-from pathlib import Path
-
-from setuptools import find_packages, setup
-
-exec(Path("calliope/_version.py").read_text()) # Sets the __version__ variable
-
-requirements = Path("requirements.txt").read_text().strip().split("\n")
-long_description = Path("README.md").read_text()
-
-
-def get_subdirs(path, glob_string):
- return [
- i.relative_to(str(path) + "/") for i in path.glob(glob_string) if i.is_dir()
- ]
-
-
-def find_calliope_package_data():
- """Returns a list of found directories with package data files"""
- path = Path("./calliope")
- package_data = ["config/*.yaml", "config/*.html", "test/common/*.yaml"]
- for subdir_level in ["*", "*/*", "*/*/*"]:
- for example_dir in get_subdirs(path, "example_models/" + subdir_level):
- package_data.append(str(example_dir) + "/*.csv")
- package_data.append(str(example_dir) + "/*.yaml")
- package_data.append(str(example_dir) + "/*.rst")
- for test_case_dir in get_subdirs(path, "test/common/*"):
- package_data.append(str(test_case_dir) + "/*.csv")
- print(package_data)
- return package_data
-
-
-setup(
- name="calliope",
- version=__version__, # noqa: F821
- author="Calliope contributors listed in AUTHORS",
- author_email="stefan@pfenninger.org",
- description="A multi-scale energy systems modelling framework",
- long_description=long_description,
- long_description_content_type="text/markdown",
- license="Apache 2.0",
- url="https://www.callio.pe/",
- download_url="https://github.com/calliope-project/calliope/releases",
- packages=find_packages(),
- package_data={"calliope": find_calliope_package_data()},
- install_requires=requirements,
- entry_points={"console_scripts": ["calliope = calliope.cli:cli"]},
- classifiers=[
- "Intended Audience :: Science/Research",
- "License :: OSI Approved :: Apache Software License",
- "Programming Language :: Python",
- "Programming Language :: Python :: 3",
- "Programming Language :: Python :: 3 :: Only",
- ],
- keywords=["energy systems", "optimisation", "mathematical programming"],
-)
diff --git a/calliope/__init__.py b/src/calliope/__init__.py
similarity index 100%
rename from calliope/__init__.py
rename to src/calliope/__init__.py
diff --git a/calliope/_version.py b/src/calliope/_version.py
similarity index 100%
rename from calliope/_version.py
rename to src/calliope/_version.py
diff --git a/calliope/backend/__init__.py b/src/calliope/backend/__init__.py
similarity index 100%
rename from calliope/backend/__init__.py
rename to src/calliope/backend/__init__.py
diff --git a/calliope/backend/backends.py b/src/calliope/backend/backends.py
similarity index 100%
rename from calliope/backend/backends.py
rename to src/calliope/backend/backends.py
diff --git a/calliope/backend/expression_parser.py b/src/calliope/backend/expression_parser.py
similarity index 100%
rename from calliope/backend/expression_parser.py
rename to src/calliope/backend/expression_parser.py
diff --git a/calliope/backend/helper_functions.py b/src/calliope/backend/helper_functions.py
similarity index 100%
rename from calliope/backend/helper_functions.py
rename to src/calliope/backend/helper_functions.py
diff --git a/calliope/backend/latex_backend.py b/src/calliope/backend/latex_backend.py
similarity index 100%
rename from calliope/backend/latex_backend.py
rename to src/calliope/backend/latex_backend.py
diff --git a/calliope/backend/parsing.py b/src/calliope/backend/parsing.py
similarity index 100%
rename from calliope/backend/parsing.py
rename to src/calliope/backend/parsing.py
diff --git a/calliope/backend/where_parser.py b/src/calliope/backend/where_parser.py
similarity index 100%
rename from calliope/backend/where_parser.py
rename to src/calliope/backend/where_parser.py
diff --git a/calliope/cli.py b/src/calliope/cli.py
similarity index 100%
rename from calliope/cli.py
rename to src/calliope/cli.py
diff --git a/calliope/config/defaults.yaml b/src/calliope/config/defaults.yaml
similarity index 100%
rename from calliope/config/defaults.yaml
rename to src/calliope/config/defaults.yaml
diff --git a/calliope/config/math_schema.yaml b/src/calliope/config/math_schema.yaml
similarity index 100%
rename from calliope/config/math_schema.yaml
rename to src/calliope/config/math_schema.yaml
diff --git a/calliope/config/model_data_lookup.yaml b/src/calliope/config/model_data_lookup.yaml
similarity index 100%
rename from calliope/config/model_data_lookup.yaml
rename to src/calliope/config/model_data_lookup.yaml
diff --git a/calliope/core/__init__.py b/src/calliope/core/__init__.py
similarity index 100%
rename from calliope/core/__init__.py
rename to src/calliope/core/__init__.py
diff --git a/calliope/core/attrdict.py b/src/calliope/core/attrdict.py
similarity index 100%
rename from calliope/core/attrdict.py
rename to src/calliope/core/attrdict.py
diff --git a/calliope/core/io.py b/src/calliope/core/io.py
similarity index 100%
rename from calliope/core/io.py
rename to src/calliope/core/io.py
diff --git a/calliope/core/model.py b/src/calliope/core/model.py
similarity index 100%
rename from calliope/core/model.py
rename to src/calliope/core/model.py
diff --git a/calliope/core/util/__init__.py b/src/calliope/core/util/__init__.py
similarity index 100%
rename from calliope/core/util/__init__.py
rename to src/calliope/core/util/__init__.py
diff --git a/calliope/core/util/generate_runs.py b/src/calliope/core/util/generate_runs.py
similarity index 100%
rename from calliope/core/util/generate_runs.py
rename to src/calliope/core/util/generate_runs.py
diff --git a/calliope/core/util/logging.py b/src/calliope/core/util/logging.py
similarity index 100%
rename from calliope/core/util/logging.py
rename to src/calliope/core/util/logging.py
diff --git a/calliope/core/util/tools.py b/src/calliope/core/util/tools.py
similarity index 100%
rename from calliope/core/util/tools.py
rename to src/calliope/core/util/tools.py
diff --git a/calliope/example_models/national_scale/model.yaml b/src/calliope/example_models/national_scale/model.yaml
similarity index 100%
rename from calliope/example_models/national_scale/model.yaml
rename to src/calliope/example_models/national_scale/model.yaml
diff --git a/calliope/example_models/national_scale/model_config/locations.yaml b/src/calliope/example_models/national_scale/model_config/locations.yaml
similarity index 100%
rename from calliope/example_models/national_scale/model_config/locations.yaml
rename to src/calliope/example_models/national_scale/model_config/locations.yaml
diff --git a/calliope/example_models/national_scale/model_config/techs.yaml b/src/calliope/example_models/national_scale/model_config/techs.yaml
similarity index 100%
rename from calliope/example_models/national_scale/model_config/techs.yaml
rename to src/calliope/example_models/national_scale/model_config/techs.yaml
diff --git a/calliope/example_models/national_scale/scenarios.yaml b/src/calliope/example_models/national_scale/scenarios.yaml
similarity index 100%
rename from calliope/example_models/national_scale/scenarios.yaml
rename to src/calliope/example_models/national_scale/scenarios.yaml
diff --git a/calliope/example_models/national_scale/timeseries_data/README.rst b/src/calliope/example_models/national_scale/timeseries_data/README.rst
similarity index 100%
rename from calliope/example_models/national_scale/timeseries_data/README.rst
rename to src/calliope/example_models/national_scale/timeseries_data/README.rst
diff --git a/calliope/example_models/national_scale/timeseries_data/csp_resource.csv b/src/calliope/example_models/national_scale/timeseries_data/csp_resource.csv
similarity index 100%
rename from calliope/example_models/national_scale/timeseries_data/csp_resource.csv
rename to src/calliope/example_models/national_scale/timeseries_data/csp_resource.csv
diff --git a/calliope/example_models/national_scale/timeseries_data/demand-1.csv b/src/calliope/example_models/national_scale/timeseries_data/demand-1.csv
similarity index 100%
rename from calliope/example_models/national_scale/timeseries_data/demand-1.csv
rename to src/calliope/example_models/national_scale/timeseries_data/demand-1.csv
diff --git a/calliope/example_models/national_scale/timeseries_data/demand-2.csv b/src/calliope/example_models/national_scale/timeseries_data/demand-2.csv
similarity index 100%
rename from calliope/example_models/national_scale/timeseries_data/demand-2.csv
rename to src/calliope/example_models/national_scale/timeseries_data/demand-2.csv
diff --git a/calliope/example_models/urban_scale/model.yaml b/src/calliope/example_models/urban_scale/model.yaml
similarity index 100%
rename from calliope/example_models/urban_scale/model.yaml
rename to src/calliope/example_models/urban_scale/model.yaml
diff --git a/calliope/example_models/urban_scale/model_config/locations.yaml b/src/calliope/example_models/urban_scale/model_config/locations.yaml
similarity index 100%
rename from calliope/example_models/urban_scale/model_config/locations.yaml
rename to src/calliope/example_models/urban_scale/model_config/locations.yaml
diff --git a/calliope/example_models/urban_scale/model_config/techs.yaml b/src/calliope/example_models/urban_scale/model_config/techs.yaml
similarity index 100%
rename from calliope/example_models/urban_scale/model_config/techs.yaml
rename to src/calliope/example_models/urban_scale/model_config/techs.yaml
diff --git a/calliope/example_models/urban_scale/scenarios.yaml b/src/calliope/example_models/urban_scale/scenarios.yaml
similarity index 100%
rename from calliope/example_models/urban_scale/scenarios.yaml
rename to src/calliope/example_models/urban_scale/scenarios.yaml
diff --git a/calliope/example_models/urban_scale/timeseries_data/demand_heat.csv b/src/calliope/example_models/urban_scale/timeseries_data/demand_heat.csv
similarity index 100%
rename from calliope/example_models/urban_scale/timeseries_data/demand_heat.csv
rename to src/calliope/example_models/urban_scale/timeseries_data/demand_heat.csv
diff --git a/calliope/example_models/urban_scale/timeseries_data/demand_power.csv b/src/calliope/example_models/urban_scale/timeseries_data/demand_power.csv
similarity index 100%
rename from calliope/example_models/urban_scale/timeseries_data/demand_power.csv
rename to src/calliope/example_models/urban_scale/timeseries_data/demand_power.csv
diff --git a/calliope/example_models/urban_scale/timeseries_data/export_power.csv b/src/calliope/example_models/urban_scale/timeseries_data/export_power.csv
similarity index 100%
rename from calliope/example_models/urban_scale/timeseries_data/export_power.csv
rename to src/calliope/example_models/urban_scale/timeseries_data/export_power.csv
diff --git a/calliope/example_models/urban_scale/timeseries_data/pv_resource.csv b/src/calliope/example_models/urban_scale/timeseries_data/pv_resource.csv
similarity index 100%
rename from calliope/example_models/urban_scale/timeseries_data/pv_resource.csv
rename to src/calliope/example_models/urban_scale/timeseries_data/pv_resource.csv
diff --git a/calliope/examples.py b/src/calliope/examples.py
similarity index 100%
rename from calliope/examples.py
rename to src/calliope/examples.py
diff --git a/calliope/exceptions.py b/src/calliope/exceptions.py
similarity index 100%
rename from calliope/exceptions.py
rename to src/calliope/exceptions.py
diff --git a/calliope/math/base.yaml b/src/calliope/math/base.yaml
similarity index 100%
rename from calliope/math/base.yaml
rename to src/calliope/math/base.yaml
diff --git a/calliope/math/operate.yaml b/src/calliope/math/operate.yaml
similarity index 100%
rename from calliope/math/operate.yaml
rename to src/calliope/math/operate.yaml
diff --git a/calliope/math/spores.yaml b/src/calliope/math/spores.yaml
similarity index 100%
rename from calliope/math/spores.yaml
rename to src/calliope/math/spores.yaml
diff --git a/calliope/math/storage_inter_cluster.yaml b/src/calliope/math/storage_inter_cluster.yaml
similarity index 100%
rename from calliope/math/storage_inter_cluster.yaml
rename to src/calliope/math/storage_inter_cluster.yaml
diff --git a/calliope/postprocess/__init__.py b/src/calliope/postprocess/__init__.py
similarity index 100%
rename from calliope/postprocess/__init__.py
rename to src/calliope/postprocess/__init__.py
diff --git a/calliope/postprocess/results.py b/src/calliope/postprocess/results.py
similarity index 100%
rename from calliope/postprocess/results.py
rename to src/calliope/postprocess/results.py
diff --git a/calliope/postprocess/util.py b/src/calliope/postprocess/util.py
similarity index 100%
rename from calliope/postprocess/util.py
rename to src/calliope/postprocess/util.py
diff --git a/calliope/preprocess/__init__.py b/src/calliope/preprocess/__init__.py
similarity index 100%
rename from calliope/preprocess/__init__.py
rename to src/calliope/preprocess/__init__.py
diff --git a/calliope/preprocess/checks.py b/src/calliope/preprocess/checks.py
similarity index 100%
rename from calliope/preprocess/checks.py
rename to src/calliope/preprocess/checks.py
diff --git a/calliope/preprocess/model_data.py b/src/calliope/preprocess/model_data.py
similarity index 100%
rename from calliope/preprocess/model_data.py
rename to src/calliope/preprocess/model_data.py
diff --git a/calliope/preprocess/model_run.py b/src/calliope/preprocess/model_run.py
similarity index 100%
rename from calliope/preprocess/model_run.py
rename to src/calliope/preprocess/model_run.py
diff --git a/calliope/preprocess/nodes.py b/src/calliope/preprocess/nodes.py
similarity index 100%
rename from calliope/preprocess/nodes.py
rename to src/calliope/preprocess/nodes.py
diff --git a/calliope/preprocess/time.py b/src/calliope/preprocess/time.py
similarity index 100%
rename from calliope/preprocess/time.py
rename to src/calliope/preprocess/time.py
diff --git a/calliope/preprocess/util.py b/src/calliope/preprocess/util.py
similarity index 100%
rename from calliope/preprocess/util.py
rename to src/calliope/preprocess/util.py
diff --git a/calliope/time/__init__.py b/src/calliope/time/__init__.py
similarity index 100%
rename from calliope/time/__init__.py
rename to src/calliope/time/__init__.py
diff --git a/calliope/time/clustering.py b/src/calliope/time/clustering.py
similarity index 100%
rename from calliope/time/clustering.py
rename to src/calliope/time/clustering.py
diff --git a/calliope/time/funcs.py b/src/calliope/time/funcs.py
similarity index 100%
rename from calliope/time/funcs.py
rename to src/calliope/time/funcs.py
diff --git a/calliope/time/masks.py b/src/calliope/time/masks.py
similarity index 100%
rename from calliope/time/masks.py
rename to src/calliope/time/masks.py
diff --git a/calliope/test/__init__.py b/tests/__init__.py
similarity index 100%
rename from calliope/test/__init__.py
rename to tests/__init__.py
diff --git a/calliope/test/common/constraint_sets.yaml b/tests/common/constraint_sets.yaml
similarity index 100%
rename from calliope/test/common/constraint_sets.yaml
rename to tests/common/constraint_sets.yaml
diff --git a/calliope/test/common/html_strings.yaml b/tests/common/html_strings.yaml
similarity index 100%
rename from calliope/test/common/html_strings.yaml
rename to tests/common/html_strings.yaml
diff --git a/calliope/test/common/lp_files/balance_conversion.lp b/tests/common/lp_files/balance_conversion.lp
similarity index 100%
rename from calliope/test/common/lp_files/balance_conversion.lp
rename to tests/common/lp_files/balance_conversion.lp
diff --git a/calliope/test/common/lp_files/carrier_production_max.lp b/tests/common/lp_files/carrier_production_max.lp
similarity index 100%
rename from calliope/test/common/lp_files/carrier_production_max.lp
rename to tests/common/lp_files/carrier_production_max.lp
diff --git a/calliope/test/common/lp_files/energy_cap.lp b/tests/common/lp_files/energy_cap.lp
similarity index 100%
rename from calliope/test/common/lp_files/energy_cap.lp
rename to tests/common/lp_files/energy_cap.lp
diff --git a/calliope/test/common/lp_files/resource_max.lp b/tests/common/lp_files/resource_max.lp
similarity index 100%
rename from calliope/test/common/lp_files/resource_max.lp
rename to tests/common/lp_files/resource_max.lp
diff --git a/calliope/test/common/lp_files/storage_max.lp b/tests/common/lp_files/storage_max.lp
similarity index 100%
rename from calliope/test/common/lp_files/storage_max.lp
rename to tests/common/lp_files/storage_max.lp
diff --git a/calliope/test/common/test_model/energy_cap_per_storage_cap.yaml b/tests/common/test_model/energy_cap_per_storage_cap.yaml
similarity index 100%
rename from calliope/test/common/test_model/energy_cap_per_storage_cap.yaml
rename to tests/common/test_model/energy_cap_per_storage_cap.yaml
diff --git a/calliope/test/common/test_model/model.yaml b/tests/common/test_model/model.yaml
similarity index 100%
rename from calliope/test/common/test_model/model.yaml
rename to tests/common/test_model/model.yaml
diff --git a/calliope/test/common/test_model/model_minimal.yaml b/tests/common/test_model/model_minimal.yaml
similarity index 100%
rename from calliope/test/common/test_model/model_minimal.yaml
rename to tests/common/test_model/model_minimal.yaml
diff --git a/calliope/test/common/test_model/scenarios.yaml b/tests/common/test_model/scenarios.yaml
similarity index 100%
rename from calliope/test/common/test_model/scenarios.yaml
rename to tests/common/test_model/scenarios.yaml
diff --git a/calliope/test/common/test_model/timeseries_data/alternating_cost.csv b/tests/common/test_model/timeseries_data/alternating_cost.csv
similarity index 100%
rename from calliope/test/common/test_model/timeseries_data/alternating_cost.csv
rename to tests/common/test_model/timeseries_data/alternating_cost.csv
diff --git a/calliope/test/common/test_model/timeseries_data/binary_one_day.csv b/tests/common/test_model/timeseries_data/binary_one_day.csv
similarity index 100%
rename from calliope/test/common/test_model/timeseries_data/binary_one_day.csv
rename to tests/common/test_model/timeseries_data/binary_one_day.csv
diff --git a/calliope/test/common/test_model/timeseries_data/carrier_ratio.csv b/tests/common/test_model/timeseries_data/carrier_ratio.csv
similarity index 100%
rename from calliope/test/common/test_model/timeseries_data/carrier_ratio.csv
rename to tests/common/test_model/timeseries_data/carrier_ratio.csv
diff --git a/calliope/test/common/test_model/timeseries_data/cluster_days.csv b/tests/common/test_model/timeseries_data/cluster_days.csv
similarity index 100%
rename from calliope/test/common/test_model/timeseries_data/cluster_days.csv
rename to tests/common/test_model/timeseries_data/cluster_days.csv
diff --git a/calliope/test/common/test_model/timeseries_data/clusters.csv b/tests/common/test_model/timeseries_data/clusters.csv
similarity index 100%
rename from calliope/test/common/test_model/timeseries_data/clusters.csv
rename to tests/common/test_model/timeseries_data/clusters.csv
diff --git a/calliope/test/common/test_model/timeseries_data/cost.csv b/tests/common/test_model/timeseries_data/cost.csv
similarity index 100%
rename from calliope/test/common/test_model/timeseries_data/cost.csv
rename to tests/common/test_model/timeseries_data/cost.csv
diff --git a/calliope/test/common/test_model/timeseries_data/demand_elec.csv b/tests/common/test_model/timeseries_data/demand_elec.csv
similarity index 100%
rename from calliope/test/common/test_model/timeseries_data/demand_elec.csv
rename to tests/common/test_model/timeseries_data/demand_elec.csv
diff --git a/calliope/test/common/test_model/timeseries_data/demand_elec_15T_to_2h.csv b/tests/common/test_model/timeseries_data/demand_elec_15T_to_2h.csv
similarity index 100%
rename from calliope/test/common/test_model/timeseries_data/demand_elec_15T_to_2h.csv
rename to tests/common/test_model/timeseries_data/demand_elec_15T_to_2h.csv
diff --git a/calliope/test/common/test_model/timeseries_data/demand_elec_15mins.csv b/tests/common/test_model/timeseries_data/demand_elec_15mins.csv
similarity index 100%
rename from calliope/test/common/test_model/timeseries_data/demand_elec_15mins.csv
rename to tests/common/test_model/timeseries_data/demand_elec_15mins.csv
diff --git a/calliope/test/common/test_model/timeseries_data/demand_elec_positive.csv b/tests/common/test_model/timeseries_data/demand_elec_positive.csv
similarity index 100%
rename from calliope/test/common/test_model/timeseries_data/demand_elec_positive.csv
rename to tests/common/test_model/timeseries_data/demand_elec_positive.csv
diff --git a/calliope/test/common/test_model/timeseries_data/demand_heat.csv b/tests/common/test_model/timeseries_data/demand_heat.csv
similarity index 100%
rename from calliope/test/common/test_model/timeseries_data/demand_heat.csv
rename to tests/common/test_model/timeseries_data/demand_heat.csv
diff --git a/calliope/test/common/test_model/timeseries_data/demand_heat_diff_dateformat.csv b/tests/common/test_model/timeseries_data/demand_heat_diff_dateformat.csv
similarity index 100%
rename from calliope/test/common/test_model/timeseries_data/demand_heat_diff_dateformat.csv
rename to tests/common/test_model/timeseries_data/demand_heat_diff_dateformat.csv
diff --git a/calliope/test/common/test_model/timeseries_data/demand_heat_wrong_dateformat.csv b/tests/common/test_model/timeseries_data/demand_heat_wrong_dateformat.csv
similarity index 100%
rename from calliope/test/common/test_model/timeseries_data/demand_heat_wrong_dateformat.csv
rename to tests/common/test_model/timeseries_data/demand_heat_wrong_dateformat.csv
diff --git a/calliope/test/common/test_model/timeseries_data/demand_heat_wrong_length.csv b/tests/common/test_model/timeseries_data/demand_heat_wrong_length.csv
similarity index 100%
rename from calliope/test/common/test_model/timeseries_data/demand_heat_wrong_length.csv
rename to tests/common/test_model/timeseries_data/demand_heat_wrong_length.csv
diff --git a/calliope/test/common/test_model/timeseries_data/demand_simple.csv b/tests/common/test_model/timeseries_data/demand_simple.csv
similarity index 100%
rename from calliope/test/common/test_model/timeseries_data/demand_simple.csv
rename to tests/common/test_model/timeseries_data/demand_simple.csv
diff --git a/calliope/test/common/test_model/timeseries_data/supply_plus_resource.csv b/tests/common/test_model/timeseries_data/supply_plus_resource.csv
similarity index 100%
rename from calliope/test/common/test_model/timeseries_data/supply_plus_resource.csv
rename to tests/common/test_model/timeseries_data/supply_plus_resource.csv
diff --git a/calliope/test/common/test_model/timeseries_data/supply_plus_resource_inf.csv b/tests/common/test_model/timeseries_data/supply_plus_resource_inf.csv
similarity index 100%
rename from calliope/test/common/test_model/timeseries_data/supply_plus_resource_inf.csv
rename to tests/common/test_model/timeseries_data/supply_plus_resource_inf.csv
diff --git a/calliope/test/common/test_model/timeseries_data/supply_simple.csv b/tests/common/test_model/timeseries_data/supply_simple.csv
similarity index 100%
rename from calliope/test/common/test_model/timeseries_data/supply_simple.csv
rename to tests/common/test_model/timeseries_data/supply_simple.csv
diff --git a/calliope/test/common/test_model/weighted_obj_func.yaml b/tests/common/test_model/weighted_obj_func.yaml
similarity index 100%
rename from calliope/test/common/test_model/weighted_obj_func.yaml
rename to tests/common/test_model/weighted_obj_func.yaml
diff --git a/calliope/test/common/util.py b/tests/common/util.py
similarity index 99%
rename from calliope/test/common/util.py
rename to tests/common/util.py
index 9bdf4258c..eefce6e5c 100644
--- a/calliope/test/common/util.py
+++ b/tests/common/util.py
@@ -4,10 +4,9 @@
from pathlib import Path
from typing import Literal, Optional, Union
+import calliope
import pytest
import xarray as xr
-
-import calliope
from calliope import AttrDict
constraint_sets = {
diff --git a/calliope/test/common/yaml_file.yaml b/tests/common/yaml_file.yaml
similarity index 100%
rename from calliope/test/common/yaml_file.yaml
rename to tests/common/yaml_file.yaml
diff --git a/calliope/test/conftest.py b/tests/conftest.py
similarity index 99%
rename from calliope/test/conftest.py
rename to tests/conftest.py
index 7c5360e26..aa9092abd 100644
--- a/calliope/test/conftest.py
+++ b/tests/conftest.py
@@ -3,10 +3,10 @@
import numpy as np
import pytest
import xarray as xr
-
from calliope import AttrDict
from calliope.backend import backends, latex_backend
-from calliope.test.common.util import build_test_model as build_model
+
+from .common.util import build_test_model as build_model
ALL_DIMS = {"nodes", "techs", "carriers", "costs", "timesteps", "carrier_tiers"}
diff --git a/calliope/test/test_backend_expression_parser.py b/tests/test_backend_expression_parser.py
similarity index 99%
rename from calliope/test/test_backend_expression_parser.py
rename to tests/test_backend_expression_parser.py
index 7e939a984..16dd52b06 100644
--- a/calliope/test/test_backend_expression_parser.py
+++ b/tests/test_backend_expression_parser.py
@@ -4,10 +4,10 @@
import numpy as np
import pyparsing as pp
import pytest
-
from calliope import exceptions
from calliope.backend import expression_parser, helper_functions
-from calliope.test.common.util import check_error_or_warning
+
+from .common.util import check_error_or_warning
SUB_EXPRESSION_CLASSIFIER = expression_parser.SUB_EXPRESSION_CLASSIFIER
diff --git a/calliope/test/test_backend_helper_functions.py b/tests/test_backend_helper_functions.py
similarity index 99%
rename from calliope/test/test_backend_helper_functions.py
rename to tests/test_backend_helper_functions.py
index 1e91b767b..25d7c7c38 100644
--- a/calliope/test/test_backend_helper_functions.py
+++ b/tests/test_backend_helper_functions.py
@@ -1,10 +1,10 @@
import numpy as np
import pytest
import xarray as xr
-
from calliope import exceptions
from calliope.backend import helper_functions
-from calliope.test.common.util import check_error_or_warning
+
+from .common.util import check_error_or_warning
@pytest.fixture(scope="module")
diff --git a/calliope/test/test_backend_latex_backend.py b/tests/test_backend_latex_backend.py
similarity index 99%
rename from calliope/test/test_backend_latex_backend.py
rename to tests/test_backend_latex_backend.py
index 183b45e51..0f87cd6dd 100644
--- a/calliope/test/test_backend_latex_backend.py
+++ b/tests/test_backend_latex_backend.py
@@ -3,10 +3,10 @@
import pytest
import xarray as xr
-
from calliope import exceptions
from calliope.backend import latex_backend
-from calliope.test.common.util import build_test_model, check_error_or_warning
+
+from .common.util import build_test_model, check_error_or_warning
class TestMathDocumentation:
diff --git a/calliope/test/test_backend_parsing.py b/tests/test_backend_parsing.py
similarity index 99%
rename from calliope/test/test_backend_parsing.py
rename to tests/test_backend_parsing.py
index 0fccdaee8..7f87040a5 100644
--- a/calliope/test/test_backend_parsing.py
+++ b/tests/test_backend_parsing.py
@@ -1,13 +1,13 @@
from io import StringIO
from unittest.mock import patch
+import calliope
import pyparsing as pp
import pytest
import ruamel.yaml as yaml
-
-import calliope
from calliope.backend import backends, expression_parser, parsing, where_parser
-from calliope.test.common.util import check_error_or_warning
+
+from .common.util import check_error_or_warning
BASE_DIMS = {"carriers", "carrier_tiers", "nodes", "techs"}
diff --git a/calliope/test/test_backend_pyomo.py b/tests/test_backend_pyomo.py
similarity index 99%
rename from calliope/test/test_backend_pyomo.py
rename to tests/test_backend_pyomo.py
index a6a135e4c..84707afc2 100755
--- a/calliope/test/test_backend_pyomo.py
+++ b/tests/test_backend_pyomo.py
@@ -1,14 +1,14 @@
import logging
from itertools import product
+import calliope.exceptions as exceptions
import numpy as np
import pyomo.kernel as pmo
import pytest # noqa: F401
import xarray as xr
-import calliope.exceptions as exceptions
-from calliope.test.common.util import build_test_model as build_model
-from calliope.test.common.util import check_error_or_warning, check_variable_exists
+from .common.util import build_test_model as build_model
+from .common.util import check_error_or_warning, check_variable_exists
@pytest.mark.xfail(reason="Not expecting operate mode to work at the moment")
diff --git a/calliope/test/test_backend_pyomo_constraints_conversion_plus.py b/tests/test_backend_pyomo_constraints_conversion_plus.py
similarity index 98%
rename from calliope/test/test_backend_pyomo_constraints_conversion_plus.py
rename to tests/test_backend_pyomo_constraints_conversion_plus.py
index e10d7987e..dbb0e3aa0 100644
--- a/calliope/test/test_backend_pyomo_constraints_conversion_plus.py
+++ b/tests/test_backend_pyomo_constraints_conversion_plus.py
@@ -1,7 +1,7 @@
import pytest # noqa: F401
-from calliope.test.common.util import build_test_model as build_model
-from calliope.test.common.util import check_variable_exists
+from .common.util import build_test_model as build_model
+from .common.util import check_variable_exists
@pytest.mark.skip(reason="to be reimplemented by comparison to LP files")
diff --git a/calliope/test/test_backend_pyomo_objective.py b/tests/test_backend_pyomo_objective.py
similarity index 98%
rename from calliope/test/test_backend_pyomo_objective.py
rename to tests/test_backend_pyomo_objective.py
index 6ee640f89..31412580f 100644
--- a/calliope/test/test_backend_pyomo_objective.py
+++ b/tests/test_backend_pyomo_objective.py
@@ -1,9 +1,9 @@
+import calliope
import pyomo.core as po
import pytest
from pytest import approx
-import calliope
-from calliope.test.common.util import build_test_model as build_model
+from .common.util import build_test_model as build_model
@pytest.mark.skip(reason="to be reimplemented by comparison to LP files")
diff --git a/calliope/test/test_backend_where_parser.py b/tests/test_backend_where_parser.py
similarity index 99%
rename from calliope/test/test_backend_where_parser.py
rename to tests/test_backend_where_parser.py
index 1e0941e3f..bfb4a2060 100644
--- a/calliope/test/test_backend_where_parser.py
+++ b/tests/test_backend_where_parser.py
@@ -2,11 +2,11 @@
import pyparsing
import pytest
import xarray as xr
-
from calliope.backend import expression_parser, helper_functions, where_parser
from calliope.core.attrdict import AttrDict
from calliope.exceptions import BackendError
-from calliope.test.common.util import check_error_or_warning
+
+from .common.util import check_error_or_warning
SUB_EXPRESSION_CLASSIFIER = expression_parser.SUB_EXPRESSION_CLASSIFIER
diff --git a/calliope/test/test_cli.py b/tests/test_cli.py
similarity index 96%
rename from calliope/test/test_cli.py
rename to tests/test_cli.py
index fdc0b604d..59833a8c0 100644
--- a/calliope/test/test_cli.py
+++ b/tests/test_cli.py
@@ -2,19 +2,22 @@
import tempfile
from pathlib import Path
+import calliope
+import importlib_resources
import pytest # noqa: F401
+from calliope import AttrDict, cli
from click.testing import CliRunner
-import calliope
-from calliope import AttrDict, cli
+_MODEL_NATIONAL = (
+ importlib_resources.files("calliope")
+ / "example_models"
+ / "national_scale"
+ / "model.yaml"
+).as_posix()
-_THIS_DIR = os.path.dirname(__file__)
-_MODEL_NATIONAL = os.path.join(
- _THIS_DIR, "..", "example_models", "national_scale", "model.yaml"
-)
-_MINIMAL_TEST_MODEL = os.path.join(
- _THIS_DIR, "common", "test_model", "model_minimal.yaml"
-)
+_MINIMAL_TEST_MODEL = (
+ Path(__file__).parent / "common" / "test_model" / "model_minimal.yaml"
+).as_posix()
class TestCLI:
diff --git a/calliope/test/test_constraint_results.py b/tests/test_constraint_results.py
similarity index 99%
rename from calliope/test/test_constraint_results.py
rename to tests/test_constraint_results.py
index 003d9dc0b..6b2bf0f83 100644
--- a/calliope/test/test_constraint_results.py
+++ b/tests/test_constraint_results.py
@@ -1,8 +1,8 @@
+import calliope
import pytest
from pytest import approx
-import calliope
-from calliope.test.common.util import build_test_model as build_model
+from .common.util import build_test_model as build_model
@pytest.mark.skip(reason="to be reimplemented by comparison to LP files")
diff --git a/calliope/test/test_core_attrdict.py b/tests/test_core_attrdict.py
similarity index 99%
rename from calliope/test/test_core_attrdict.py
rename to tests/test_core_attrdict.py
index 9aa8d8593..c2029e90b 100644
--- a/calliope/test/test_core_attrdict.py
+++ b/tests/test_core_attrdict.py
@@ -5,9 +5,9 @@
import numpy as np
import pytest
import ruamel.yaml as ruamel_yaml
-
from calliope.core.attrdict import _MISSING, AttrDict
-from calliope.test.common.util import check_error_or_warning
+
+from .common.util import check_error_or_warning
class TestAttrDict:
diff --git a/calliope/test/test_core_future_warnings.py b/tests/test_core_future_warnings.py
similarity index 89%
rename from calliope/test/test_core_future_warnings.py
rename to tests/test_core_future_warnings.py
index b19d2445e..dc1b3de05 100644
--- a/calliope/test/test_core_future_warnings.py
+++ b/tests/test_core_future_warnings.py
@@ -1,7 +1,7 @@
import pytest
-from calliope.test.common.util import build_test_model as build_model
-from calliope.test.common.util import check_error_or_warning
+from .common.util import build_test_model as build_model
+from .common.util import check_error_or_warning
class TestDeprecationWarnings:
diff --git a/calliope/test/test_core_model.py b/tests/test_core_model.py
similarity index 99%
rename from calliope/test/test_core_model.py
rename to tests/test_core_model.py
index 0eced0588..1f011d692 100644
--- a/calliope/test/test_core_model.py
+++ b/tests/test_core_model.py
@@ -2,12 +2,12 @@
import os
from pathlib import Path
+import calliope
import numpy as np
import pytest
-import calliope
-from calliope.test.common.util import build_test_model as build_model
-from calliope.test.common.util import check_error_or_warning
+from .common.util import build_test_model as build_model
+from .common.util import check_error_or_warning
LOGGER = "calliope.core.model"
diff --git a/calliope/test/test_core_preprocess.py b/tests/test_core_preprocess.py
similarity index 99%
rename from calliope/test/test_core_preprocess.py
rename to tests/test_core_preprocess.py
index 58e3c5435..31d65bd64 100644
--- a/calliope/test/test_core_preprocess.py
+++ b/tests/test_core_preprocess.py
@@ -1,16 +1,16 @@
import os
+import calliope
+import calliope.exceptions as exceptions
import numpy as np
import pandas as pd
import pytest
-from pytest import approx
-
-import calliope
-import calliope.exceptions as exceptions
from calliope.core.attrdict import AttrDict
from calliope.preprocess import time
-from calliope.test.common.util import build_test_model as build_model
-from calliope.test.common.util import check_error_or_warning, defaults
+from pytest import approx
+
+from .common.util import build_test_model as build_model
+from .common.util import check_error_or_warning, defaults
class TestModelRun:
diff --git a/calliope/test/test_core_time.py b/tests/test_core_time.py
similarity index 99%
rename from calliope/test/test_core_time.py
rename to tests/test_core_time.py
index 36f47a4d3..c6c78b86f 100644
--- a/calliope/test/test_core_time.py
+++ b/tests/test_core_time.py
@@ -1,12 +1,12 @@
+import calliope
import numpy as np
import pandas as pd
import pytest # noqa: F401
-
-import calliope
from calliope import exceptions
-from calliope.test.common.util import build_test_model, check_error_or_warning
from calliope.time import funcs, masks
+from .common.util import build_test_model, check_error_or_warning
+
class TestClustering:
@pytest.fixture
diff --git a/calliope/test/test_core_util.py b/tests/test_core_util.py
similarity index 95%
rename from calliope/test/test_core_util.py
rename to tests/test_core_util.py
index 475589618..57fe8420e 100644
--- a/calliope/test/test_core_util.py
+++ b/tests/test_core_util.py
@@ -1,13 +1,12 @@
import datetime
import glob
import logging
-import os
from pathlib import Path
+import calliope
+import importlib_resources
import jsonschema
import pytest
-
-import calliope
from calliope.core.util.generate_runs import generate_runs
from calliope.core.util.logging import log_time
from calliope.core.util.tools import (
@@ -17,15 +16,12 @@
validate_dict,
)
from calliope.exceptions import ModelError
-from calliope.test.common.util import check_error_or_warning, python36_or_higher
-_MODEL_NATIONAL = os.path.join(
- os.path.dirname(__file__), "..", "example_models", "national_scale", "model.yaml"
-)
+from .common.util import check_error_or_warning, python36_or_higher
-_MODEL_URBAN = os.path.join(
- os.path.dirname(__file__), "..", "example_models", "urban_scale", "model.yaml"
-)
+_EXAMPLES_DIR = importlib_resources.files("calliope") / "example_models"
+_MODEL_NATIONAL = (_EXAMPLES_DIR / "national_scale" / "model.yaml").as_posix()
+_MODEL_URBAN = (_EXAMPLES_DIR / "urban_scale" / "model.yaml").as_posix()
class TestMemoization:
diff --git a/calliope/test/test_example_models.py b/tests/test_example_models.py
similarity index 99%
rename from calliope/test/test_example_models.py
rename to tests/test_example_models.py
index 7d73bf052..69aa33df0 100755
--- a/calliope/test/test_example_models.py
+++ b/tests/test_example_models.py
@@ -1,13 +1,13 @@
import shutil
+import calliope
import numpy as np
import pandas as pd
import pytest
+from calliope import exceptions
from pytest import approx
-import calliope
-from calliope import exceptions
-from calliope.test.common.util import check_error_or_warning
+from .common.util import check_error_or_warning
class TestModelPreproccessing:
diff --git a/calliope/test/test_io.py b/tests/test_io.py
similarity index 99%
rename from calliope/test/test_io.py
rename to tests/test_io.py
index cf2662711..13b453c6c 100644
--- a/calliope/test/test_io.py
+++ b/tests/test_io.py
@@ -1,10 +1,9 @@
import os
import tempfile
+import calliope
import pytest # noqa: F401
import xarray as xr
-
-import calliope
from calliope import exceptions
diff --git a/calliope/test/test_math.py b/tests/test_math.py
similarity index 95%
rename from calliope/test/test_math.py
rename to tests/test_math.py
index bb45860d2..0b2887bcc 100644
--- a/calliope/test/test_math.py
+++ b/tests/test_math.py
@@ -1,12 +1,12 @@
from pathlib import Path
+import calliope
import numpy as np
import pytest
+from calliope import AttrDict
from pyomo.repn.tests import lp_diff
-import calliope
-from calliope import AttrDict
-from calliope.test.common.util import build_lp, build_test_model
+from .common.util import build_lp, build_test_model
@pytest.fixture(scope="class")
@@ -15,9 +15,7 @@ def _compare_lps(model, custom_math, filename):
lp_file = filename + ".lp"
generated_file = Path(tmpdir_factory.mktemp("lp_files")) / lp_file
build_lp(model, generated_file, custom_math)
- expected_file = (
- Path(calliope.__file__).parent / "test" / "common" / "lp_files" / lp_file
- )
+ expected_file = Path(__file__).parent / "common" / "lp_files" / lp_file
diff = lp_diff.load_and_compare_lp_baseline(
generated_file.as_posix(), expected_file.as_posix()
)
diff --git a/calliope/test/test_model_data.py b/tests/test_model_data.py
similarity index 98%
rename from calliope/test/test_model_data.py
rename to tests/test_model_data.py
index 3ba42559a..8451aa919 100644
--- a/calliope/test/test_model_data.py
+++ b/tests/test_model_data.py
@@ -1,29 +1,22 @@
import logging
-import os
+from pathlib import Path
+import calliope.exceptions as exceptions
import numpy as np
import pandas as pd
import pytest
-
-import calliope
-import calliope.exceptions as exceptions
from calliope._version import __version__
from calliope.core.attrdict import AttrDict
from calliope.preprocess import model_run_from_yaml
from calliope.preprocess.model_data import ModelDataFactory
-from calliope.test.common.util import check_error_or_warning
+
+from .common.util import check_error_or_warning
@pytest.fixture(scope="module")
def model_run():
- filepath = os.path.join(
- os.path.dirname(calliope.__file__),
- "test",
- "common",
- "test_model",
- "model.yaml",
- )
- return model_run_from_yaml(filepath, scenario="simple_supply")[0]
+ filepath = Path(__file__).parent / "common" / "test_model" / "model.yaml"
+ return model_run_from_yaml(filepath.as_posix(), scenario="simple_supply")[0]
class TestModelData:
diff --git a/calliope/test/test_model_manipulation.py b/tests/test_model_manipulation.py
similarity index 95%
rename from calliope/test/test_model_manipulation.py
rename to tests/test_model_manipulation.py
index 1e66a23a2..a1bf08166 100644
--- a/calliope/test/test_model_manipulation.py
+++ b/tests/test_model_manipulation.py
@@ -1,8 +1,8 @@
import pytest # noqa: F401
-
from calliope import exceptions
-from calliope.test.common.util import build_test_model as build_model
-from calliope.test.common.util import check_error_or_warning
+
+from .common.util import build_test_model as build_model
+from .common.util import check_error_or_warning
class TestExistsFalse: