Skip to content

Commit

Permalink
Update to nixpkgs 23.11, improve testing in nix
Browse files Browse the repository at this point in the history
  • Loading branch information
otargowski committed Dec 1, 2023
1 parent ab26268 commit c818cee
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 12 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ config/supervisord.conf
config/supervisord-conf-vars.conf
config/logging.json

/.tox
result
14 changes: 7 additions & 7 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
description = "The task runner used by SIO2";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-23.05";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
inputs.flake-utils.url = "github:numtide/flake-utils";
inputs.filetracker = {
url = "github:Stowarzyszenie-Talent/filetracker";
Expand Down
12 changes: 11 additions & 1 deletion nix/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,22 @@ buildPythonPackage {
};

doCheck = false;
NO_JAVA_TESTS = "1";
#TEST_SANDBOXES = "1"; # These are broken anyway, `supervisor` moment.
# Doesn't set correctly without this for some reason.
LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive";

# Only for tests
nativeBuildInputs = [
pytest
pytest-runner
pytest-timeout
pkgs.gcc pkgs.fpc
];

# Only for tests
buildInputs = [
pkgs.glibc.static
];

propagatedBuildInputs = [
Expand All @@ -48,4 +59,3 @@ buildPythonPackage {
bsddb3
];
}

6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
'bsddb3<6.3',
'simplejson<3.20',
#'supervisor>=4.0,<4.3',
'Twisted<22.11',
'Twisted>=23.8,<23.9',
'sortedcontainers<2.5',
'six<1.17',
'urllib3<1.27',
'urllib3>=2.0,<2.1',
],

extras_require = {
'dev' : [
'pytest<7.3',
'pytest<8',
'pytest-timeout<2.2',
'tox',
]
Expand Down

0 comments on commit c818cee

Please sign in to comment.