Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 23 additions & 12 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
environment:
matrix:
- julia_version: 0.6
PYTHON: "C:\\Python27\\python.exe"
python_version: "27"
- julia_version: 0.6
PYTHON: "C:\\Python34\\python.exe"
python_version: "37"
- julia_version: 0.6
PYTHON: "Conda"
python_version: "Conda"

- julia_version: 0.7
PYTHON: "C:\\Python27\\python.exe"
python_version: "27"
- julia_version: 0.7
PYTHON: "C:\\Python34\\python.exe"
python_version: "37"
- julia_version: 0.7
PYTHON: "Conda"
python_version: "Conda"

- julia_version: 1
PYTHON: "C:\\Python27\\python.exe"
python_version: "27"
- julia_version: 1
PYTHON: "C:\\Python34\\python.exe"
python_version: "37"
- julia_version: 1
PYTHON: "Conda"
python_version: "Conda"

- julia_version: nightly
PYTHON: "C:\\Python27\\python.exe"
python_version: "27"
- julia_version: nightly
PYTHON: "C:\\Python34\\python.exe"
python_version: "37"
- julia_version: nightly
PYTHON: "Conda"
python_version: "Conda"

platform:
- x86 # 32-bit
Expand All @@ -53,9 +53,20 @@ install:
- ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1"))

build_script:
- ps: if ( -not ( $env:python_version -eq "Conda" )) {
if ($env:PLATFORM -eq "x64") {
$env:PYTHON = "C:\\Python" + $env:python_version + "-x64\\python.exe"
} else {
$env:PYTHON = "C:\\Python" + $env:python_version + "\\python.exe"
}
}
# For the path to Python executables, see:
# https://www.appveyor.com/docs/build-environment/#python
- echo "%PYTHON%"
- echo "%JL_BUILD_SCRIPT%"
- C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"

test_script:
- echo "%PYTHON%"
- echo "%JL_TEST_SCRIPT%"
- C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"
8 changes: 8 additions & 0 deletions src/pydates.jl
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,19 @@ struct PyDateTime_CAPI
DeltaType::PyPtr
TZInfoType::PyPtr

# singletons:
@static if pyversion >= v"3.7"
TimeZone_UTC::PyPtr
end

# function pointers:
Date_FromDate::Ptr{Cvoid}
DateTime_FromDateAndTime::Ptr{Cvoid}
Time_FromTime::Ptr{Cvoid}
Delta_FromDelta::Ptr{Cvoid}
@static if pyversion >= v"3.7"
TimeZone_FromTimeZone::Ptr{Cvoid}
end
DateTime_FromTimestamp::Ptr{Cvoid}
Date_FromTimestamp::Ptr{Cvoid}
end
Expand Down