Skip to content

Commit

Permalink
Trying to fix tests in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
zomglings committed Feb 3, 2023
1 parent 78f0d20 commit 7a81501
Show file tree
Hide file tree
Showing 19 changed files with 23 additions and 21 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/game7ctl.lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: "3.10"
python-version: "3.9"
- name: Upgrade pip and setuptools
run: pip install --upgrade pip setuptools
- name: Install black
- name: Install dependencies (including dev dependencies)
working-directory: game7ctl/
run: pip install black
env:
BROWNIE_LIB: 1
run: pip install -e ".[dev]"
- name: Black syntax check
working-directory: game7ctl/
run: black --check game7ctl
2 changes: 1 addition & 1 deletion contracts/diamond/Diamond.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;
pragma solidity 0.8.17;

// Adapted from the Diamond 3 reference implementation by Nick Mudge:
// https://github.com/mudgen/diamond-3-hardhat
Expand Down
2 changes: 1 addition & 1 deletion contracts/facets/DiamondCutFacet.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;
pragma solidity 0.8.17;

// Adapted from the Diamond 3 reference implementation by Nick Mudge:
// https://github.com/mudgen/diamond-3-hardhat
Expand Down
2 changes: 1 addition & 1 deletion contracts/facets/DiamondLoupeFacet.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;
pragma solidity 0.8.17;

// Adapted from the Diamond 3 reference implementation by Nick Mudge:
// https://github.com/mudgen/diamond-3-hardhat
Expand Down
2 changes: 1 addition & 1 deletion contracts/facets/InventoryFacet.sol
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* GitHub: https://github.com/G7DAO/contracts
*/

pragma solidity ^0.8.0;
pragma solidity 0.8.17;

import {TerminusPermissions} from "@moonstream/contracts/terminus/TerminusPermissions.sol";
import {DiamondReentrancyGuard} from "@moonstream-engine/contracts/diamond/security/DiamondReentrancyGuard.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/facets/OwnershipFacet.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;
pragma solidity 0.8.17;

import {LibDiamond} from "../libraries/LibDiamond.sol";
import {IERC173} from "../interfaces/IERC173.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/IDiamond.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;
pragma solidity 0.8.17;

interface IDiamond {
fallback() external payable;
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/IDiamondCut.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;
pragma solidity 0.8.17;

// Adapted from the Diamond 3 reference implementation by Nick Mudge:
// https://github.com/mudgen/diamond-3-hardhat
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/IDiamondLoupe.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;
pragma solidity 0.8.17;

// Adapted from the Diamond 3 reference implementation by Nick Mudge:
// https://github.com/mudgen/diamond-3-hardhat
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/IERC165.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;
pragma solidity 0.8.17;

interface IERC165 {
/// @notice Query if a contract implements an interface
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/IERC173.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;
pragma solidity 0.8.17;

/// @title ERC-173 Contract Ownership Standard
interface IERC173 {
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/IInventory.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;
pragma solidity 0.8.17;

import "../libraries/LibInventory.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/libraries/LibDiamond.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;
pragma solidity 0.8.17;

// Adapted from the Diamond 3 reference implementation by Nick Mudge:
// https://github.com/mudgen/diamond-3-hardhat
Expand Down
2 changes: 1 addition & 1 deletion contracts/libraries/LibInventory.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;
pragma solidity 0.8.17;

/**
LibInventory defines the storage structure used by the Inventory contract as a facet for an EIP-2535 Diamond
Expand Down
2 changes: 1 addition & 1 deletion contracts/mock/MockERC1155.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: UNLICENSED
///@notice This contract is for mock for WETH token.
pragma solidity ^0.8.0;
pragma solidity 0.8.17;

import "@openzeppelin-contracts/contracts/token/ERC1155/extensions/ERC1155Burnable.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/mock/MockERC20.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: UNLICENSED
///@notice This contract is for mock for WETH token.
pragma solidity ^0.8.0;
pragma solidity 0.8.17;

import "@openzeppelin-contracts/contracts/token/ERC20/ERC20.sol";
import "@openzeppelin-contracts/contracts/token/ERC20/extensions/ERC20Burnable.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/mock/MockERC721.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: UNLICENSED
pragma solidity ^0.8.0;
pragma solidity 0.8.17;

import "@openzeppelin-contracts/contracts/token/ERC721/extensions/ERC721Enumerable.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/mock/MockTerminus.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: UNLICENSED
///@notice This contract is for mock for terminus token (used only for cli generation).
pragma solidity ^0.8.0;
pragma solidity 0.8.17;

import "@moonstream/contracts/terminus/TerminusFacet.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/mock/ShibaERC721.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: UNLICENSED
pragma solidity ^0.8.0;
pragma solidity 0.8.17;

import "@openzeppelin-contracts/contracts/token/ERC721/extensions/ERC721URIStorage.sol";
import "@openzeppelin-contracts/contracts/token/ERC721/ERC721.sol";
Expand Down

0 comments on commit 7a81501

Please sign in to comment.